diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2014-08-26 04:42:59 +0300 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2014-09-10 20:29:56 +0000 |
| commit | 6a93f5ae04c118bc90ac6adbb5d4a486671fce5c (patch) | |
| tree | 6bb8bf0c7c8b347bfad9685a77c71b0a6634fce6 /res | |
| parent | e75bdcde162c131e216ad5384e446d4b738a0518 (diff) | |
| download | android_packages_apps_Camera2-6a93f5ae04c118bc90ac6adbb5d4a486671fce5c.tar.gz android_packages_apps_Camera2-6a93f5ae04c118bc90ac6adbb5d4a486671fce5c.tar.bz2 android_packages_apps_Camera2-6a93f5ae04c118bc90ac6adbb5d4a486671fce5c.zip | |
Camera: Enable all slow shutter speeds
Change-Id: Ib04ac2e2e59684e7b3747ab68c2e7ffac8386f97
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/cm_arrays.xml | 14 | ||||
| -rw-r--r-- | res/xml/camera_preferences.xml | 5 |
2 files changed, 1 insertions, 18 deletions
diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml index 2f38bf60c..c76fc02a9 100644 --- a/res/values/cm_arrays.xml +++ b/res/values/cm_arrays.xml @@ -66,7 +66,6 @@ <string-array name="pref_camera_slow_shutter_entries" translatable="false"> <item>@string/pref_camera_slow_shutter_entry_off</item> <item>@string/pref_camera_slow_shutter_entry_auto</item> - <!-- <item>@string/pref_camera_slow_shutter_entry_half_second</item> <item>@string/pref_camera_slow_shutter_entry_1s</item> <item>@string/pref_camera_slow_shutter_entry_2s</item> @@ -75,14 +74,12 @@ <item>@string/pref_camera_slow_shutter_entry_16s</item> <item>@string/pref_camera_slow_shutter_entry_32s</item> <item>@string/pref_camera_slow_shutter_entry_64s</item> - --> </string-array> <!-- 0 is off, 1 is auto, specific values are in microseconds --> <string-array name="pref_camera_slow_shutter_entryvalues" translatable="false"> <item>0</item> <item>1</item> - <!-- <item>500000</item> <item>1000000</item> <item>2000000</item> @@ -91,12 +88,6 @@ <item>16000000</item> <item>32000000</item> <item>64000000</item> - --> - </string-array> - - <string-array name="pref_camera_slow_shutter_icons" translatable="false"> - <item>@drawable/ic_slowshutter_off</item> - <item>@drawable/ic_slowshutter</item> </string-array> <string-array name="pref_camera_beauty_mode_icons" translatable="false"> @@ -109,11 +100,6 @@ <item>@string/camera_menu_beauty_mode_label</item> </string-array> - <string-array name="pref_camera_slow_shutter_labels" translatable="false"> - <item>@string/camera_menu_slow_shutter_label</item> - <item>@string/camera_menu_slow_shutter_label</item> - </string-array> - <!-- Automatic scene detection --> <!-- String values of detected scenes --> diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index 4420a6268..8001b7307 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -246,13 +246,10 @@ camera:labelList="@array/pref_camera_beauty_mode_labels" camera:entries="@array/pref_switch_entries" camera:entryValues="@array/pref_switch_entryvalues" /> - <IconListPreference + <ListPreference camera:key="pref_camera_slow_shutter" camera:defaultValue="@string/pref_camera_slow_shutter_default" camera:title="@string/pref_camera_slow_shutter_title" - camera:icons="@array/pref_camera_slow_shutter_icons" - camera:largeIcons="@array/pref_camera_slow_shutter_icons" - camera:labelList="@array/pref_camera_slow_shutter_labels" camera:entries="@array/pref_camera_slow_shutter_entries" camera:entryValues="@array/pref_camera_slow_shutter_entryvalues" /> <IconListPreference |