diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-01-09 17:51:25 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-01-09 17:51:25 -0800 |
| commit | b97ccf3f20bee44daf70f10966809e39e30ab4f7 (patch) | |
| tree | fb6c421cd04ffed74e50cd62e4fdab34d5a9f448 /res/xml | |
| parent | 0eaec58e292ce4eaa6baadecf643f0f65e48d278 (diff) | |
| download | LegacyCamera-b97ccf3f20bee44daf70f10966809e39e30ab4f7.zip LegacyCamera-b97ccf3f20bee44daf70f10966809e39e30ab4f7.tar.gz LegacyCamera-b97ccf3f20bee44daf70f10966809e39e30ab4f7.tar.bz2 | |
auto import from //branches/cupcake/...@125939
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/camera_preferences.xml | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index 77c01b3..4d8b7b7 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -20,43 +20,21 @@ <PreferenceCategory android:title="@string/pref_camera_general_settings_category"> -<!-- - <CheckBoxPreference - android:key="pref_camera_autoupload_key" - android:title="@string/pref_camera_autoupload_title" - android:summary="@string/pref_camera_autoupload_summary" - android:defaultValue="false"/> - <EditTextPreference - android:key="pref_camera_upload_albumname_key" - android:title="@string/pref_camera_upload_albumname_title" - android:summary="@string/pref_camera_upload_albumname_summary" - android:dialogTitle="@string/pref_camera_upload_albumname_dialogtitle" - android:singleLine="true" /> - <CheckBoxPreference - android:key="pref_camera_shuttersound_key" - android:title="@string/pref_camera_shuttersound_title" - android:summary="@string/pref_camera_shuttersound_summary" - android:defaultValue="true"/> ---> + <CheckBoxPreference android:key="pref_camera_recordlocation_key" android:title="@string/pref_camera_recordlocation_title" android:summary="@string/pref_camera_recordlocation_summary" android:defaultValue="false"/> - <CheckBoxPreference - android:key="pref_camera_postpicturemenu_key" - android:title="@string/pref_camera_postpicturemenu_title" - android:summary="@string/pref_camera_postpicturemenu_summary" - android:defaultValue="true"/> </PreferenceCategory> <PreferenceCategory android:title="@string/pref_camera_videoquality_category"> + <!-- android:summary is filled in by CameraSettings --> <ListPreference android:key="pref_camera_videoquality_key" android:defaultValue="@string/pref_camera_videoquality_default" android:title="@string/pref_camera_videoquality_title" - android:summary="@string/pref_camera_videoquality_summary" android:entries="@array/pref_camera_videoquality_entries" android:entryValues="@array/pref_camera_videoquality_entryvalues" android:dialogTitle="@string/pref_camera_videoquality_dialogtitle" /> |