Merge "Fix various UI issues."

4 files changed, 29 insertions, 58 deletions

diff --git a/res/layout-xlarge/in_line_setting_picker.xml b/res/layout-xlarge/in_line_setting_picker.xml
index 1f95d30..1457b4f 100644
--- a/res/layout-xlarge/in_line_setting_picker.xml
+++ b/res/layout-xlarge/in_line_setting_picker.xml
@@ -18,8 +18,11 @@
 -->
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
+    <TextView android:id="@+id/title"
+        style="@style/SettingPickerText"  />
+
     <Button android:id="@+id/decrement"
-        android:layout_width="48dp"
+        android:layout_width="72dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:gravity="center"
@@ -39,7 +42,7 @@
         android:textSize="20dp" />
 
     <Button android:id="@+id/increment"
-        android:layout_width="48dp"
+        android:layout_width="72dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:gravity="center"
diff --git a/res/layout-xlarge/other_setting_popup.xml b/res/layout-xlarge/other_setting_popup.xml
index fb8df48..5fd345d 100644
--- a/res/layout-xlarge/other_setting_popup.xml
+++ b/res/layout-xlarge/other_setting_popup.xml
@@ -23,47 +23,19 @@
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
-        android:layout_marginRight="40dp">
+        android:layout_marginRight="40dp"
+        android:orientation="vertical">
 
-    <TableRow style="@style/OtherSettingTableRow">
-        <TextView android:text="@string/pref_camera_recordlocation_title"
-            style="@style/SettingPickerText" />
-        <com.android.camera.ui.InLineSettingPicker
-            camera:prefKey="pref_camera_recordlocation_key" />
-    </TableRow>
-
-    <TableRow style="@style/OtherSettingTableRow">
-        <TextView android:text="@string/pref_camera_focusmode_title"
-            style="@style/SettingPickerText"  />
-        <com.android.camera.ui.InLineSettingPicker
-            camera:prefKey="pref_camera_focusmode_key" />
-    </TableRow>
-
-    <TableRow style="@style/OtherSettingTableRow">
-        <TextView android:text="@string/pref_exposure_title"
-            style="@style/SettingPickerText"  />
-        <com.android.camera.ui.InLineSettingPicker
-            camera:prefKey="pref_camera_exposure_key" />
-    </TableRow>
-
-    <TableRow style="@style/OtherSettingTableRow">
-        <TextView android:text="@string/pref_camera_picturesize_title"
-            style="@style/SettingPickerText"  />
-        <com.android.camera.ui.InLineSettingPicker
-            camera:prefKey="pref_camera_picturesize_key" />
-    </TableRow>
-
-    <TableRow style="@style/OtherSettingTableRow">
-        <TextView android:text="@string/pref_camera_jpegquality_title"
-            style="@style/SettingPickerText"  />
-        <com.android.camera.ui.InLineSettingPicker
-            camera:prefKey="pref_camera_jpegquality_key" />
-    </TableRow>
-
-    <TableRow style="@style/OtherSettingTableRow">
-        <TextView android:text="@string/pref_camera_scenemode_title"
-            style="@style/SettingPickerText"  />
-        <com.android.camera.ui.InLineSettingPicker
-            camera:prefKey="pref_camera_scenemode_key" />
-    </TableRow>
+    <com.android.camera.ui.InLineSettingPicker camera:prefKey="pref_camera_recordlocation_key"
+        style="@style/SettingRow" />
+    <com.android.camera.ui.InLineSettingPicker camera:prefKey="pref_camera_focusmode_key"
+        style="@style/SettingRow" />
+    <com.android.camera.ui.InLineSettingPicker camera:prefKey="pref_camera_exposure_key"
+        style="@style/SettingRow" />
+    <com.android.camera.ui.InLineSettingPicker camera:prefKey="pref_camera_picturesize_key"
+        style="@style/SettingRow" />
+    <com.android.camera.ui.InLineSettingPicker camera:prefKey="pref_camera_jpegquality_key"
+        style="@style/SettingRow" />
+    <com.android.camera.ui.InLineSettingPicker camera:prefKey="pref_camera_scenemode_key"
+        style="@style/SettingRow" />
 </com.android.camera.ui.OtherSettingsPopup>
diff --git a/res/layout-xlarge/setting_item.xml b/res/layout-xlarge/setting_item.xml
index 3ac8375..3f26a4b 100644
--- a/res/layout-xlarge/setting_item.xml
+++ b/res/layout-xlarge/setting_item.xml
@@ -17,22 +17,15 @@
 */
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="wrap_content"
-    android:layout_height="35dp"
-    android:paddingLeft="14dp"
-    android:paddingRight="14dp"
-    style="@style/OtherSettingTableRow">
+    style="@style/SettingRow">
 
     <TextView android:id="@+id/text"
         style="@style/SettingPickerText"
-        android:layout_height="wrap_content"
-        android:gravity="left"
-        android:singleLine="true"
         android:textColor="@drawable/btn_setting_picker" />
     <ImageView android:id="@+id/image"
         android:layout_width="35dp"
         android:layout_height="35dp"
+        android:layout_marginRight="14dp"
         android:gravity="center"
         android:scaleType="fitCenter"
         android:adjustViewBounds="true" />
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3c84e6d..5244d05 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -74,13 +74,16 @@
     <style name="SettingPickerText">
         <item name="android:textSize">22dp</item>
         <item name="android:gravity">left|center_vertical</item>
-        <item name="android:layout_width">210dp</item>
-        <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:layout_width">190dp</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:singleLine">true</item>
     </style>
-    <style name="OtherSettingTableRow">
-        <item name="android:layout_marginTop">16dp</item>
-        <item name="android:layout_marginBottom">16dp</item>
+    <style name="SettingRow">
+        <item name="android:layout_marginLeft">16dp</item>
         <item name="android:gravity">center_vertical</item>
+        <item name="android:orientation">horizontal</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">55dp</item>
     </style>
     <style name="OnScreenGpsIndicator">
         <item name="android:layout_height">wrap_content</item>