Unbundle with the PreferenceManager.

Change-Id: Ib415bf36147f35cbf1681cd87514124822ac48c6

3 files changed, 91 insertions, 93 deletions

diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 96f4ebf..7a4f19d 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -14,6 +14,15 @@
      limitations under the License.
 -->
 <resources>
+    <declare-styleable name="CameraPreference">
+        <attr name="title" format="string" />
+    </declare-styleable>
+    <declare-styleable name="ListPreference">
+        <attr name="key" format="string" />
+        <attr name="defaultValue" format="string" />
+        <attr name="entryValues" format="reference" />
+        <attr name="entries" format="reference" />
+    </declare-styleable>
     <declare-styleable name="IconIndicator">
         <attr name="icons" format="reference" />
         <attr name="modes" format="reference" />
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 3c348a7..5c0fede 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -14,65 +14,59 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:camera="http://schemas.android.com/apk/res/com.android.camera">
-    <PreferenceCategory android:title="@string/pref_camera_settings_category">
-        <com.android.camera.IconListPreference
-                android:key="pref_camera_flashmode_key"
-                android:defaultValue="@string/pref_camera_flashmode_default"
-                android:title="@string/pref_camera_flashmode_title"
+<PreferenceGroup
+        xmlns:camera="http://schemas.android.com/apk/res/com.android.camera" >
+    <PreferenceGroup
+            camera:title="@string/pref_camera_settings_category">
+        <IconListPreference
+                camera:key="pref_camera_flashmode_key"
+                camera:defaultValue="@string/pref_camera_flashmode_default"
+                camera:title="@string/pref_camera_flashmode_title"
                 camera:icons="@array/pref_camera_flashmode_icons"
-                android:entries="@array/pref_camera_flashmode_entries"
-                android:entryValues="@array/pref_camera_flashmode_entryvalues"
-                android:dialogTitle="@string/pref_camera_flashmode_dialogtitle" />
+                camera:entries="@array/pref_camera_flashmode_entries"
+                camera:entryValues="@array/pref_camera_flashmode_entryvalues" />
         <ListPreference
-                android:key="pref_camera_scenemode_key"
-                android:defaultValue="@string/pref_camera_scenemode_default"
-                android:title="@string/pref_camera_scenemode_title"
-                android:entries="@array/pref_camera_scenemode_entries"
-                android:entryValues="@array/pref_camera_scenemode_entryvalues"
-                android:dialogTitle="@string/pref_camera_scenemode_dialogtitle" />
-        <com.android.camera.IconListPreference
-                android:key="pref_camera_whitebalance_key"
-                android:defaultValue="@string/pref_camera_whitebalance_default"
-                android:title="@string/pref_camera_whitebalance_title"
+                camera:key="pref_camera_scenemode_key"
+                camera:defaultValue="@string/pref_camera_scenemode_default"
+                camera:title="@string/pref_camera_scenemode_title"
+                camera:entries="@array/pref_camera_scenemode_entries"
+                camera:entryValues="@array/pref_camera_scenemode_entryvalues" />
+        <IconListPreference
+                camera:key="pref_camera_whitebalance_key"
+                camera:defaultValue="@string/pref_camera_whitebalance_default"
+                camera:title="@string/pref_camera_whitebalance_title"
                 camera:icons="@array/pref_camera_whitebalance_icons"
-                android:entries="@array/pref_camera_whitebalance_entries"
-                android:entryValues="@array/pref_camera_whitebalance_entryvalues"
-                android:dialogTitle="@string/pref_camera_whitebalance_dialogtitle" />
+                camera:entries="@array/pref_camera_whitebalance_entries"
+                camera:entryValues="@array/pref_camera_whitebalance_entryvalues" />
         <ListPreference
-                android:key="pref_camera_coloreffect_key"
-                android:defaultValue="@string/pref_camera_coloreffect_default"
-                android:title="@string/pref_camera_coloreffect_title"
-                android:entries="@array/pref_camera_coloreffect_entries"
-                android:entryValues="@array/pref_camera_coloreffect_entryvalues"
-                android:dialogTitle="@string/pref_camera_coloreffect_dialogtitle" />
-        <com.android.camera.RecordLocationPreference
-                android:key="pref_camera_recordlocation_key"
-                android:defaultValue="@string/pref_camera_recordlocation_default"
-                android:title="@string/pref_camera_recordlocation_title"
-                android:entries="@array/pref_camera_recordlocation_entries"
-                android:entryValues="@array/pref_camera_recordlocation_entryvalues" />
+                camera:key="pref_camera_coloreffect_key"
+                camera:defaultValue="@string/pref_camera_coloreffect_default"
+                camera:title="@string/pref_camera_coloreffect_title"
+                camera:entries="@array/pref_camera_coloreffect_entries"
+                camera:entryValues="@array/pref_camera_coloreffect_entryvalues" />
+        <RecordLocationPreference
+                camera:key="pref_camera_recordlocation_key"
+                camera:defaultValue="@string/pref_camera_recordlocation_default"
+                camera:title="@string/pref_camera_recordlocation_title"
+                camera:entries="@array/pref_camera_recordlocation_entries"
+                camera:entryValues="@array/pref_camera_recordlocation_entryvalues" />
         <ListPreference
-                android:key="pref_camera_picturesize_key"
-                android:title="@string/pref_camera_picturesize_title"
-                android:entries="@array/pref_camera_picturesize_entries"
-                android:entryValues="@array/pref_camera_picturesize_entryvalues"
-                android:dialogTitle="@string/pref_camera_picturesize_dialogtitle" />
+                camera:key="pref_camera_picturesize_key"
+                camera:title="@string/pref_camera_picturesize_title"
+                camera:entries="@array/pref_camera_picturesize_entries"
+                camera:entryValues="@array/pref_camera_picturesize_entryvalues" />
         <ListPreference
-                android:key="pref_camera_jpegquality_key"
-                android:defaultValue="@string/pref_camera_jpegquality_default"
-                android:title="@string/pref_camera_jpegquality_title"
-                android:entries="@array/pref_camera_jpegquality_entries"
-                android:entryValues="@array/pref_camera_jpegquality_entryvalues"
-                android:dialogTitle="@string/pref_camera_jpegquality_dialogtitle" />
-        <com.android.camera.IconListPreference
-                android:key="pref_camera_focusmode_key"
-                android:defaultValue="@string/pref_camera_focusmode_default"
-                android:title="@string/pref_camera_focusmode_title"
+                camera:key="pref_camera_jpegquality_key"
+                camera:defaultValue="@string/pref_camera_jpegquality_default"
+                camera:title="@string/pref_camera_jpegquality_title"
+                camera:entries="@array/pref_camera_jpegquality_entries"
+                camera:entryValues="@array/pref_camera_jpegquality_entryvalues" />
+        <IconListPreference
+                camera:key="pref_camera_focusmode_key"
+                camera:defaultValue="@string/pref_camera_focusmode_default"
+                camera:title="@string/pref_camera_focusmode_title"
                 camera:icons="@array/pref_camera_focusmode_icons"
-                android:entries="@array/pref_camera_focusmode_entries"
-                android:entryValues="@array/pref_camera_focusmode_entryvalues"
-                android:dialogTitle="@string/pref_camera_focusmode_dialogtitle" />
-    </PreferenceCategory>
-</PreferenceScreen>
+                camera:entries="@array/pref_camera_focusmode_entries"
+                camera:entryValues="@array/pref_camera_focusmode_entryvalues" />
+    </PreferenceGroup>
+</PreferenceGroup>
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index 3f8b99d..677a9b9 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -14,46 +14,41 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:camera="http://schemas.android.com/apk/res/com.android.camera">
-    <PreferenceCategory
-            android:title="@string/pref_camcorder_settings_category">
+<PreferenceGroup
+        xmlns:camera="http://schemas.android.com/apk/res/com.android.camera" >
+    <PreferenceGroup
+        camera:title="@string/pref_camcorder_settings_category">
         <ListPreference
-                android:key="pref_camera_videoquality_key"
-                android:defaultValue="@string/pref_camera_videoquality_default"
-                android:title="@string/pref_camera_videoquality_title"
-                android:entries="@array/pref_camera_videoquality_entries"
-                android:entryValues="@array/pref_camera_videoquality_entryvalues"
-                android:dialogTitle="@string/pref_camera_videoquality_dialogtitle" />
+                camera:key="pref_camera_videoquality_key"
+                camera:defaultValue="@string/pref_camera_videoquality_default"
+                camera:title="@string/pref_camera_videoquality_title"
+                camera:entries="@array/pref_camera_videoquality_entries"
+                camera:entryValues="@array/pref_camera_videoquality_entryvalues"/>
         <ListPreference
-                android:key="pref_camera_video_duration_key"
-                android:defaultValue="@string/pref_camera_video_duration_default"
-                android:title="@string/pref_camera_video_duration_title"
-                android:entries="@array/pref_camera_video_duration_entries"
-                android:entryValues="@array/pref_camera_video_duration_entryvalues"
-                android:dialogTitle="@string/pref_camera_video_duration_dialogtitle" />
-        <com.android.camera.IconListPreference
-                android:key="pref_camera_video_flashmode_key"
-                android:defaultValue="@string/pref_camera_video_flashmode_default"
-                android:title="@string/pref_camera_flashmode_title"
+                camera:key="pref_camera_video_duration_key"
+                camera:defaultValue="@string/pref_camera_video_duration_default"
+                camera:title="@string/pref_camera_video_duration_title"
+                camera:entries="@array/pref_camera_video_duration_entries"
+                camera:entryValues="@array/pref_camera_video_duration_entryvalues"/>
+        <IconListPreference
+                camera:key="pref_camera_video_flashmode_key"
+                camera:defaultValue="@string/pref_camera_video_flashmode_default"
+                camera:title="@string/pref_camera_flashmode_title"
                 camera:icons="@array/pref_camera_video_flashmode_icons"
-                android:entries="@array/pref_camera_video_flashmode_entries"
-                android:entryValues="@array/pref_camera_video_flashmode_entryvalues"
-                android:dialogTitle="@string/pref_camera_flashmode_dialogtitle" />
-        <com.android.camera.IconListPreference
-                android:key="pref_camera_whitebalance_key"
-                android:defaultValue="@string/pref_camera_whitebalance_default"
-                android:title="@string/pref_camera_whitebalance_title"
+                camera:entries="@array/pref_camera_video_flashmode_entries"
+                camera:entryValues="@array/pref_camera_video_flashmode_entryvalues"/>
+        <IconListPreference
+                camera:key="pref_camera_whitebalance_key"
+                camera:defaultValue="@string/pref_camera_whitebalance_default"
+                camera:title="@string/pref_camera_whitebalance_title"
                 camera:icons="@array/pref_camera_whitebalance_icons"
-                android:entries="@array/pref_camera_whitebalance_entries"
-                android:entryValues="@array/pref_camera_whitebalance_entryvalues"
-                android:dialogTitle="@string/pref_camera_whitebalance_dialogtitle" />
+                camera:entries="@array/pref_camera_whitebalance_entries"
+                camera:entryValues="@array/pref_camera_whitebalance_entryvalues"/>
         <ListPreference
-                android:key="pref_camera_coloreffect_key"
-                android:defaultValue="@string/pref_camera_coloreffect_default"
-                android:title="@string/pref_camera_coloreffect_title"
-                android:entries="@array/pref_camera_coloreffect_entries"
-                android:entryValues="@array/pref_camera_coloreffect_entryvalues"
-                android:dialogTitle="@string/pref_camera_coloreffect_dialogtitle" />
-    </PreferenceCategory>
-</PreferenceScreen>
+                camera:key="pref_camera_coloreffect_key"
+                camera:defaultValue="@string/pref_camera_coloreffect_default"
+                camera:title="@string/pref_camera_coloreffect_title"
+                camera:entries="@array/pref_camera_coloreffect_entries"
+                camera:entryValues="@array/pref_camera_coloreffect_entryvalues"/>
+    </PreferenceGroup>
+</PreferenceGroup>