diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2014-01-20 20:40:32 +0200 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2017-01-04 21:57:38 +0200 |
| commit | b4f53f59f218dd0fe0cb1e9c5edef7b56894ebcf (patch) | |
| tree | 68178ce3c29d69c6eb89ae188b70d7c5bcccbc3d /res/xml | |
| parent | 21f9c8d2db00b3f09de9d9a80877f7d5fa8e13ef (diff) | |
| download | android_packages_apps_Snap-b4f53f59f218dd0fe0cb1e9c5edef7b56894ebcf.tar.gz android_packages_apps_Snap-b4f53f59f218dd0fe0cb1e9c5edef7b56894ebcf.tar.bz2 android_packages_apps_Snap-b4f53f59f218dd0fe0cb1e9c5edef7b56894ebcf.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 | 7 | ||||
| -rw-r--r-- | res/xml/video_preferences.xml | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index 742c09d33..d6bed124f 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -386,4 +386,11 @@ camera:title="@string/pref_camera2_camera2_title" camera:entries="@array/pref_camera2_camera2_entries" camera:entryValues="@array/pref_camera2_camera2_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> diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml index 6eba729d9..69d195f4e 100644 --- a/res/xml/video_preferences.xml +++ b/res/xml/video_preferences.xml @@ -184,4 +184,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> |