diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2014-01-20 20:40:32 +0200 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2015-09-17 23:26:02 +0300 |
| commit | 69fe66517f086a01b6f9fb80e669256ec11c6625 (patch) | |
| tree | f2645455775f1fe11616071ae9771ab418832247 /res/xml | |
| parent | 090a890049355881cba3ed6d503aebafae056384 (diff) | |
| download | android_packages_apps_Snap-69fe66517f086a01b6f9fb80e669256ec11c6625.tar.gz android_packages_apps_Snap-69fe66517f086a01b6f9fb80e669256ec11c6625.tar.bz2 android_packages_apps_Snap-69fe66517f086a01b6f9fb80e669256ec11c6625.zip | |
Camera: Powerkey shutter (2/2)
Ported from cm-10.1
Including cm-10.1 camera commit:
aa4ae80a41fbab763891c5ef6d67a9e5b4bb981b Don't mess around with pref local ID for power shutter initialization.
Includes http://review.cyanogenmod.org/56986
[mikeioannina]: Updates for L
Signed-off-by: Michael Bestas <mikeioannina@gmail.com>
Change-Id: I0992baa558eefd306d00fbece59cb5c512d9448b
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/camera_preferences.xml | 6 | ||||
| -rw-r--r-- | res/xml/video_preferences.xml | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index 6fc88a35f..2f48c20e3 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -341,4 +341,10 @@ camera:title="@string/pref_camera_manual_focus_title" camera:entries="@array/pref_camera_manual_focus_entries" camera:entryValues="@array/pref_camera_manual_focus_entry_values" /> + <ListPreference + camera:key="pref_power_shutter" + camera:defaultValue="@string/pref_camera_power_shutter_default" + camera:title="@string/pref_camera_power_shutter_title" + camera:entries="@array/pref_switch_entries" + camera:entryValues="@array/pref_switch_entryvalues" /> </PreferenceGroup> diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml index 2c67a4782..91452ce94 100644 --- a/res/xml/video_preferences.xml +++ b/res/xml/video_preferences.xml @@ -161,4 +161,10 @@ camera:title="@string/pref_camera_video_rotation_title" camera:entries="@array/pref_camera_video_rotation_entries" camera:entryValues="@array/pref_camera_video_rotation_entryvalues" /> + <ListPreference + camera:key="pref_power_shutter" + camera:defaultValue="@string/pref_camera_power_shutter_default" + camera:title="@string/pref_camera_power_shutter_title" + camera:entries="@array/pref_switch_entries" + camera:entryValues="@array/pref_switch_entryvalues" /> </PreferenceGroup> |