summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAlan Newberger <alann@google.com>2014-07-17 09:55:34 -0700
committerAlan Newberger <alann@google.com>2014-07-18 10:28:37 -0700
commit39529585aee23703553c551eadceca78742cf52b (patch)
tree757cc8ee1f51afb7d432fdadf5e405d45e9db623 /res
parent71ae986c611c49674d53af48e56da629de0ace93 (diff)
downloadandroid_packages_apps_Camera2-39529585aee23703553c551eadceca78742cf52b.tar.gz
android_packages_apps_Camera2-39529585aee23703553c551eadceca78742cf52b.tar.bz2
android_packages_apps_Camera2-39529585aee23703553c551eadceca78742cf52b.zip
Route switch preferences through SettingManager
This CL adds a custom switch which uses SettingsManager to control boolean settings. It relocates SettingsManager to the application to allow access from multiple activities. Bug: 16327665 Change-Id: I6af084a4443ea79ca270dab382a66ea527897a38
Diffstat (limited to 'res')
-rw-r--r--res/xml/camera_preferences.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 4ca61b28b..e60be3223 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -54,7 +54,7 @@
</PreferenceScreen>
<!-- Location -->
- <SwitchPreference
+ <com.android.camera.settings.ManagedSwitchPreference
android:defaultValue="false"
android:key="pref_camera_recordlocation_key"
android:title="@string/pref_camera_save_location_title" />
@@ -64,7 +64,7 @@
android:key="pref_category_advanced"
android:title="@string/pref_category_advanced" >
- <SwitchPreference
+ <com.android.camera.settings.ManagedSwitchPreference
android:defaultValue="false"
android:key="pref_camera_exposure_compensation_key"
android:title="@string/pref_camera_exposure_compensation" />
@@ -75,4 +75,4 @@
android:key="pref_launch_help"
android:title="@string/setting_google_help_and_feedback" />
-</PreferenceScreen> \ No newline at end of file
+</PreferenceScreen>