Move scene mode to indicator wheel.

bug:3156671
Change-Id: I8e663f7bfde805eeef06bf4f3d9b883a58e51ce5

5 files changed, 6 insertions, 19 deletions

diff --git a/res/layout-xlarge/other_setting_popup.xml b/res/layout-xlarge/other_setting_popup.xml
index 7c61d7b..d52a6c0 100644
--- a/res/layout-xlarge/other_setting_popup.xml
+++ b/res/layout-xlarge/other_setting_popup.xml
@@ -55,7 +55,5 @@
                 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" />
     </LinearLayout>
 </com.android.camera.ui.OtherSettingsPopup>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index d50cebc..ce2e085 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -274,20 +274,6 @@
         <item>green-tint</item>
     </string-array>
 
-    <!-- Color effect has no separate icons. -->
-    <array name="coloreffect_largeicons" translatable="false">
-        <item>@drawable/ic_viewfinder_coloreffect</item>
-        <item>@drawable/ic_viewfinder_coloreffect</item>
-        <item>@drawable/ic_viewfinder_coloreffect</item>
-        <item>@drawable/ic_viewfinder_coloreffect</item>
-        <item>@drawable/ic_viewfinder_coloreffect</item>
-        <item>@drawable/ic_viewfinder_coloreffect</item>
-        <item>@drawable/ic_viewfinder_coloreffect</item>
-        <item>@drawable/ic_viewfinder_coloreffect</item>
-        <item>@drawable/ic_viewfinder_coloreffect</item>
-        <item>@drawable/ic_viewfinder_coloreffect</item>
-    </array>
-
     <array name="coloreffect_images" translatable="false">
         <item>@drawable/btn_coloreffect_none</item>
         <item>@drawable/btn_coloreffect_mono</item>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 5238020..2ce9d42 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -28,6 +28,8 @@
         <attr name="modes" format="reference" />
     </declare-styleable>
     <declare-styleable name="IconListPreference">
+        <!-- If a preference does not have individual icons for each entry, it can has a single icon to represent it. -->
+        <attr name="singleIcon" format="reference" />
         <attr name="icons" />
         <attr name="largeIcons" format="reference" />
         <attr name="images" format="reference" />
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 1b3bcee..70cb4c0 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -30,10 +30,11 @@
                 camera:key="pref_camera_exposure_key"
                 camera:defaultValue="@string/pref_exposure_default"
                 camera:title="@string/pref_exposure_title" />
-        <ListPreference
+        <IconListPreference
                 camera:key="pref_camera_scenemode_key"
                 camera:defaultValue="@string/pref_camera_scenemode_default"
                 camera:title="@string/pref_camera_scenemode_title"
+                camera:singleIcon="@drawable/ic_viewfinder_camera_facing_back"
                 camera:entries="@array/pref_camera_scenemode_entries"
                 camera:entryValues="@array/pref_camera_scenemode_entryvalues" />
         <IconListPreference
@@ -48,7 +49,7 @@
                 camera:key="pref_camera_coloreffect_key"
                 camera:defaultValue="@string/pref_camera_coloreffect_default"
                 camera:title="@string/pref_camera_coloreffect_title"
-                camera:largeIcons="@array/coloreffect_largeicons"
+                camera:singleIcon="@drawable/ic_viewfinder_coloreffect"
                 camera:images="@array/coloreffect_images"
                 camera:entries="@array/pref_camera_coloreffect_entries"
                 camera:entryValues="@array/pref_camera_coloreffect_entryvalues" />
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index cc9871d..02e8ba4 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -58,7 +58,7 @@
                 camera:key="pref_camera_coloreffect_key"
                 camera:defaultValue="@string/pref_camera_coloreffect_default"
                 camera:title="@string/pref_camera_coloreffect_title"
-                camera:largeIcons="@array/coloreffect_largeicons"
+                camera:singleIcon="@drawable/ic_viewfinder_coloreffect"
                 camera:images="@array/coloreffect_images"
                 camera:entries="@array/pref_camera_coloreffect_entries"
                 camera:entryValues="@array/pref_camera_coloreffect_entryvalues"/>