Add divider between settings in popup window.

bug:3242802
Change-Id: I37742a8db4ddaa272d0a84f395d7f6afe89a7909

8 files changed, 121 insertions, 74 deletions

diff --git a/res/drawable-hdpi/divider_horizontal_holo_dark.9.png b/res/drawable-hdpi/divider_horizontal_holo_dark.9.png
new file mode 100644
index 0000000..e720253
--- /dev/null
+++ b/res/drawable-hdpi/divider_horizontal_holo_dark.9.png
diff --git a/res/drawable-mdpi/divider_horizontal_holo_dark.9.png b/res/drawable-mdpi/divider_horizontal_holo_dark.9.png
new file mode 100644
index 0000000..e720253
--- /dev/null
+++ b/res/drawable-mdpi/divider_horizontal_holo_dark.9.png
diff --git a/res/drawable/setting_picker.xml b/res/drawable/setting_picker.xml
index 60ece1d..8763ff3 100644
--- a/res/drawable/setting_picker.xml
+++ b/res/drawable/setting_picker.xml
@@ -15,7 +15,7 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
+    <item android:state_selected="true"
             android:drawable="@drawable/setting_picker_pressed" />
     <item android:drawable="@android:color/transparent" />
 </selector>
diff --git a/res/layout-xlarge/basic_setting_popup.xml b/res/layout-xlarge/basic_setting_popup.xml
index a7cf4e1..12e572f 100644
--- a/res/layout-xlarge/basic_setting_popup.xml
+++ b/res/layout-xlarge/basic_setting_popup.xml
@@ -34,14 +34,26 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="left|bottom"
-                android:layout_marginLeft="16dp"
+                android:layout_marginLeft="10dp"
                 android:layout_marginBottom="10dp"
+                android:paddingLeft="16dp"
                 android:textColor="@android:color/white"
                 style="@style/SettingPickerText" />
     </FrameLayout>
-    <LinearLayout android:id="@+id/contentPanel"
-            android:layout_width="wrap_content"
+    <FrameLayout android:paddingTop="10dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/dialog_bottom_holo_dark"
-            android:orientation="vertical" />
+            android:background="@drawable/dialog_bottom_holo_dark">
+            <ScrollView android:orientation="vertical"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_gravity="center"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content">
+                <LinearLayout android:id="@+id/contentPanel"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical" />
+            </ScrollView>
+    </FrameLayout>
 </com.android.camera.ui.BasicSettingPopup>
diff --git a/res/layout-xlarge/in_line_setting_picker.xml b/res/layout-xlarge/in_line_setting_picker.xml
index 1457b4f..cb39319 100644
--- a/res/layout-xlarge/in_line_setting_picker.xml
+++ b/res/layout-xlarge/in_line_setting_picker.xml
@@ -17,38 +17,52 @@
 */
 -->
 
-<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="72dp"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:gravity="center"
-        android:text="@string/setting_decrement"
-        android:textColor="@drawable/btn_setting_picker"
-        android:textSize="20dp"
-        android:textStyle="bold"
-        android:background="@android:color/transparent" />
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:orientation="vertical">
+    <ImageView android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:src="@drawable/divider_horizontal_holo_dark"
+            android:gravity="center"
+            android:scaleType="fitXY"
+            android:adjustViewBounds="true" />
+    <LinearLayout android:orientation="horizontal"
+            style="@style/SettingRow">
+        <TextView android:id="@+id/title"
+                style="@style/SettingPickerText"  />
 
-    <TextView android:id="@+id/current_setting"
-        android:layout_width="130dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:gravity="center"
-        android:singleLine="true"
-        android:textColor="@android:color/white"
-        android:textSize="20dp" />
+        <Button android:id="@+id/decrement"
+                android:layout_width="72dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:gravity="center"
+                android:text="@string/setting_decrement"
+                android:textColor="@drawable/btn_setting_picker"
+                android:textSize="20dp"
+                android:textStyle="bold"
+                android:background="@android:color/transparent" />
 
-    <Button android:id="@+id/increment"
-        android:layout_width="72dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:gravity="center"
-        android:text="@string/setting_increment"
-        android:textColor="@drawable/btn_setting_picker"
-        android:textSize="20dp"
-        android:textStyle="bold"
-        android:background="@android:color/transparent" />
-</merge>
+        <TextView android:id="@+id/current_setting"
+                android:layout_width="130dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:gravity="center"
+                android:singleLine="true"
+                android:textColor="@android:color/white"
+                android:textSize="20dp" />
+
+        <Button android:id="@+id/increment"
+                android:layout_width="72dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:gravity="center"
+                android:text="@string/setting_increment"
+                android:textColor="@drawable/btn_setting_picker"
+                android:textSize="20dp"
+                android:textStyle="bold"
+                android:background="@android:color/transparent" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/res/layout-xlarge/other_setting_popup.xml b/res/layout-xlarge/other_setting_popup.xml
index 4527bf1..16a773d 100644
--- a/res/layout-xlarge/other_setting_popup.xml
+++ b/res/layout-xlarge/other_setting_popup.xml
@@ -37,32 +37,44 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="left|bottom"
-                android:layout_marginLeft="16dp"
+                android:layout_marginLeft="10dp"
                 android:layout_marginBottom="10dp"
+                android:paddingLeft="16dp"
                 android:textColor="@android:color/white"
                 style="@style/SettingPickerText" />
     </FrameLayout>
 
-    <LinearLayout android:id="@+id/contentPanel"
-            android:layout_width="wrap_content"
+    <FrameLayout android:paddingTop="10dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/dialog_bottom_holo_dark"
-            android:orientation="vertical">
-        <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" />
-        <TextView
-                android:text="@string/pref_restore_detail"
-                android:gravity="center"
-                android:textSize="22dp"
-                style="@style/SettingRow">
-        </TextView>
-    </LinearLayout>
+            android:background="@drawable/dialog_bottom_holo_dark">
+        <ScrollView android:orientation="vertical"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:layout_gravity="center"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+            <LinearLayout android:id="@+id/contentPanel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+                <com.android.camera.ui.InLineSettingPicker camera:prefKey="pref_camera_recordlocation_key"
+                        android:layout_width="wrap_content" android:layout_height="wrap_content" />
+                <com.android.camera.ui.InLineSettingPicker camera:prefKey="pref_camera_focusmode_key"
+                        android:layout_width="wrap_content" android:layout_height="wrap_content" />
+                <com.android.camera.ui.InLineSettingPicker camera:prefKey="pref_camera_exposure_key"
+                        android:layout_width="wrap_content" android:layout_height="wrap_content" />
+                <com.android.camera.ui.InLineSettingPicker camera:prefKey="pref_camera_picturesize_key"
+                        android:layout_width="wrap_content" android:layout_height="wrap_content" />
+                <com.android.camera.ui.InLineSettingPicker camera:prefKey="pref_camera_jpegquality_key"
+                        android:layout_width="wrap_content" android:layout_height="wrap_content" />
+                <TextView
+                        android:text="@string/pref_restore_detail"
+                        android:gravity="center"
+                        android:textSize="22dp"
+                        style="@style/SettingRow">
+                </TextView>
+            </LinearLayout>
+        </ScrollView>
+    </FrameLayout>
 </com.android.camera.ui.OtherSettingsPopup>
diff --git a/res/layout-xlarge/setting_item.xml b/res/layout-xlarge/setting_item.xml
index 3f26a4b..3e0df71 100644
--- a/res/layout-xlarge/setting_item.xml
+++ b/res/layout-xlarge/setting_item.xml
@@ -17,16 +17,27 @@
 */
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/SettingRow">
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+    <ImageView android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:src="@drawable/divider_horizontal_holo_dark"
+            android:gravity="center"
+            android:scaleType="fitXY"
+            android:adjustViewBounds="true" />
+    <LinearLayout android:id="@+id/setting_row"
+        style="@style/SettingRow">
 
-    <TextView android:id="@+id/text"
-        style="@style/SettingPickerText"
-        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" />
+        <TextView android:id="@+id/text"
+                style="@style/SettingPickerText"
+                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" />
+    </LinearLayout>
 </LinearLayout>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 0d0634f..a545454 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -79,12 +79,10 @@
         <item name="android:singleLine">true</item>
     </style>
     <style name="SettingRow">
-        <item name="android:layout_marginLeft">16dp</item>
-        <item name="android:layout_marginRight">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>
+        <item name="android:layout_height">48dp</item>
         <item name="android:background">@drawable/setting_picker</item>
     </style>
     <style name="OnScreenGpsIndicator">