Add char limit to some strings.

Also adjust the layout according to char limit and remove
unused time lapse strings.

bug:3329896
Change-Id: Icb8b909b4936d548825bd2dc279962fac0978203

6 files changed, 16 insertions, 17 deletions

diff --git a/res/layout-xlarge/basic_setting_popup.xml b/res/layout-xlarge/basic_setting_popup.xml
index 263d25a..d18dae2 100644
--- a/res/layout-xlarge/basic_setting_popup.xml
+++ b/res/layout-xlarge/basic_setting_popup.xml
@@ -18,7 +18,7 @@
 -->
 
 <com.android.camera.ui.BasicSettingPopup xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="359dp"
+        android:layout_width="410dp"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_alignParentRight="true"
diff --git a/res/layout-xlarge/in_line_setting_picker.xml b/res/layout-xlarge/in_line_setting_picker.xml
index 47cd024..f4ba7a4 100644
--- a/res/layout-xlarge/in_line_setting_picker.xml
+++ b/res/layout-xlarge/in_line_setting_picker.xml
@@ -24,7 +24,9 @@
             android:orientation="horizontal"
             style="@style/SettingRow">
         <TextView android:id="@+id/title"
-                style="@style/SettingPickerText"  />
+                style="@style/SettingPickerText"
+                android:layout_width="220dp"
+                android:layout_height="match_parent" />
 
         <Button android:id="@+id/decrement"
                 android:layout_width="72dp"
diff --git a/res/layout-xlarge/other_setting_popup.xml b/res/layout-xlarge/other_setting_popup.xml
index a916165..4dfbe62 100644
--- a/res/layout-xlarge/other_setting_popup.xml
+++ b/res/layout-xlarge/other_setting_popup.xml
@@ -37,7 +37,8 @@
                 style="@style/SettingTitleText" />
     </FrameLayout>
 
-    <FrameLayout android:layout_width="570dp"
+    <FrameLayout
+            android:layout_width="590dp"
             android:layout_height="wrap_content"
             android:background="@drawable/dialog_bottom_holo_dark">
         <ListView android:id="@+id/settingList"
diff --git a/res/layout-xlarge/setting_item.xml b/res/layout-xlarge/setting_item.xml
index da54ddc..43e6271 100644
--- a/res/layout-xlarge/setting_item.xml
+++ b/res/layout-xlarge/setting_item.xml
@@ -20,11 +20,12 @@
         style="@style/SettingRow">
 
         <TextView android:id="@+id/text"
-                style="@style/SettingPickerText"/>
+                style="@style/SettingPickerText"
+                android:layout_width="267dp"
+                android:layout_height="match_parent"/>
         <ImageView android:id="@+id/image"
                 android:layout_width="35dp"
                 android:layout_height="35dp"
-                android:gravity="center"
                 android:scaleType="fitCenter"
                 android:adjustViewBounds="true" />
 </LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index cf35cb6..c4612c7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -144,25 +144,22 @@
     <string name="pref_camera_recordlocation_entry_off">Off</string>
     <string name="pref_camera_recordlocation_entry_on">On</string>
 
-    <!-- The Video length settings in preference -->
+    <!-- The Video quality settings in preference [CHAR LIMIT=21] -->
     <string name="pref_video_quality_title">Video quality</string>
     <string name="pref_video_quality_default" translatable="false">high</string>
+    <!-- Video quality setting entry. Videos will be recorded in high quality. [CHAR LIMIT=24] -->
     <string name="pref_video_quality_entry_high">High</string>
+    <!-- Video quality setting entry. Videos will be recorded in low quality. [CHAR LIMIT=24] -->
     <string name="pref_video_quality_entry_low">Low</string>
+    <!-- Video quality setting entry. Videos will be recorded in low quality and the length is at most 30 seconds. [CHAR LIMIT=24] -->
     <string name="pref_video_quality_entry_mms">MMS (Low, 30s)</string>
+    <!-- Video quality setting entry. Videos will be recorded in high quality and the length is at most 15 minutes. [CHAR LIMIT=24] -->
     <string name="pref_video_quality_entry_youtube">YouTube (High, 15m)</string>
 
     <string name="pref_video_quality_high" translatable="false">high</string>
     <string name="pref_video_quality_low" translatable="false">low</string>
     <string name="pref_video_quality_mms" translatable="false">mms</string>
     <string name="pref_video_quality_youtube" translatable="false">youtube</string>
-    <!-- Describes the preference dialog for choosing quality for time lapse video.
-    Appears at top of the dialog. [CHAR LIMIT=30] -->
-    <string name="pref_video_time_lapse_quality_title">Time lapse video quality</string>
-    <!-- Refers to the video quality [CHAR LIMIT=8] -->
-    <string name="pref_video_time_lapse_quality_entry_low">Low</string>
-    <!-- Refers to the video quality [CHAR LIMIT=8] -->
-    <string name="pref_video_time_lapse_quality_entry_high">High</string>
 
     <!-- Describes the preference dialog for choosing interval between frame capture for
     time lapse recording. Appears at top of the dialog. [CHAR LIMIT=30] -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index aabc62d..05c28a0 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -85,8 +85,6 @@
     <style name="SettingPickerText">
         <item name="android:textSize">21dp</item>
         <item name="android:gravity">left|center_vertical</item>
-        <item name="android:layout_width">200dp</item>
-        <item name="android:layout_height">match_parent</item>
         <item name="android:textColor">@android:color/white</item>
         <item name="android:singleLine">true</item>
     </style>
@@ -95,8 +93,8 @@
         <item name="android:orientation">horizontal</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">48dp</item>
-        <item name="android:paddingLeft">16dp</item>
-        <item name="android:paddingRight">16dp</item>
+        <item name="android:paddingLeft">8dp</item>
+        <item name="android:paddingRight">8dp</item>
         <item name="android:background">@drawable/setting_picker</item>
     </style>
     <style name="OnScreenGpsIndicator">