diff options
author | Owen Lin <owenlin@google.com> | 2009-11-18 17:54:42 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-18 17:54:42 -0800 |
commit | e1706c13d469a163d811e29d33b86cc5d4bf67e9 (patch) | |
tree | c5da43f3039f27b45b0e49baf280585479df51d3 /res/xml | |
parent | ec1b9c508c4d04d68131579c4716ff32a3e29740 (diff) | |
parent | 3e44f8076a16792bb295589ca4b467ba27ea2a6f (diff) | |
download | LegacyCamera-e1706c13d469a163d811e29d33b86cc5d4bf67e9.zip LegacyCamera-e1706c13d469a163d811e29d33b86cc5d4bf67e9.tar.gz LegacyCamera-e1706c13d469a163d811e29d33b86cc5d4bf67e9.tar.bz2 |
am 3e44f807: Use "Use My Location" settings to decide wheather we store the picture\'s location.
Merge commit '3e44f8076a16792bb295589ca4b467ba27ea2a6f' into eclair-mr2
* commit '3e44f8076a16792bb295589ca4b467ba27ea2a6f':
Use "Use My Location" settings to decide wheather we store the picture's location.
Diffstat (limited to 'res/xml')
-rw-r--r-- | res/xml/camera_preferences.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index a59de44..3c348a7 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -47,7 +47,7 @@ android:entries="@array/pref_camera_coloreffect_entries" android:entryValues="@array/pref_camera_coloreffect_entryvalues" android:dialogTitle="@string/pref_camera_coloreffect_dialogtitle" /> - <com.android.camera.BooleanListPreference + <com.android.camera.RecordLocationPreference android:key="pref_camera_recordlocation_key" android:defaultValue="@string/pref_camera_recordlocation_default" android:title="@string/pref_camera_recordlocation_title" |