diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-01-17 14:40:32 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-01-17 14:40:32 -0800 |
| commit | 5f68baf3967d9e05850cc6de904fb8d980c89f96 (patch) | |
| tree | aa534cea38378a47ef3c40f1c3b9dee64dd6b25c /res | |
| parent | 4b4da269394faf0e864fa31837c03b8c244cd561 (diff) | |
| parent | c1a696583dac3da1853f582e4fac6a1eca4cfac5 (diff) | |
| download | android_packages_apps_Snap-5f68baf3967d9e05850cc6de904fb8d980c89f96.tar.gz android_packages_apps_Snap-5f68baf3967d9e05850cc6de904fb8d980c89f96.tar.bz2 android_packages_apps_Snap-5f68baf3967d9e05850cc6de904fb8d980c89f96.zip | |
Merge "SnapdragonCamera: Add abortCaptures for flush" into camera-SnapdragonCamera.lnx.2.0
Diffstat (limited to 'res')
| -rwxr-xr-x | res/values/camera2arrays.xml | 11 | ||||
| -rwxr-xr-x | res/values/qcomstrings.xml | 7 | ||||
| -rwxr-xr-x | res/xml/capture_preferences.xml | 7 | ||||
| -rwxr-xr-x | res/xml/setting_menu_preferences.xml | 9 |
4 files changed, 34 insertions, 0 deletions
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml index f51e2f808..4083f4528 100755 --- a/res/values/camera2arrays.xml +++ b/res/values/camera2arrays.xml @@ -1232,4 +1232,15 @@ for time lapse recording --> <item>@string/pref_camera2_fs2_entry_value_disable</item> <item>@string/pref_camera2_fs2_entry_value_enable</item> </string-array> + + <string-array name="pref_camera2_abort_captures_entries" translatable="false"> + <item>@string/pref_camera2_abort_captures_entry_disable</item> + <item>@string/pref_camera2_abort_captures_entry_enable</item> + </string-array> + + <string-array name="pref_camera2_abort_captures_entryvalues" translatable="false"> + <item>@string/pref_camera2_abort_captures_entry_value_disable</item> + <item>@string/pref_camera2_abort_captures_entry_value_enable</item> + </string-array> + </resources> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 877a9ac3c..0d324d0b8 100755 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -1300,5 +1300,12 @@ <string name="pref_camera2_fs2_entry_value_enable" translatable="false">1</string> <string name="pref_camera2_fs2_entry_value_disable" translatable="false">0</string> + <string name="pref_camera2_abort_captures_title" translatable="true">Abort Captures</string> + <string name="pref_camera2_abort_captures_default" translatable="false">1</string> + <string name="pref_camera2_abort_captures_entry_enable" translatable="true">enable</string> + <string name="pref_camera2_abort_captures_entry_disable" translatable="true">disable</string> + <string name="pref_camera2_abort_captures_entry_value_enable" translatable="false">1</string> + <string name="pref_camera2_abort_captures_entry_value_disable" translatable="false">0</string> + </resources> diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml index cb5b73e2d..51002729e 100755 --- a/res/xml/capture_preferences.xml +++ b/res/xml/capture_preferences.xml @@ -469,4 +469,11 @@ camera:entries="@array/pref_camera2_fs2_entries" camera:entryValues="@array/pref_camera2_fs2_entryvalues" /> + <ListPreference + camera:key="pref_camera2_abort_captures_key" + camera:defaultValue="@string/pref_camera2_abort_captures_default" + camera:title="@string/pref_camera2_abort_captures_title" + camera:entries="@array/pref_camera2_abort_captures_entries" + camera:entryValues="@array/pref_camera2_abort_captures_entryvalues" /> + </PreferenceGroup> diff --git a/res/xml/setting_menu_preferences.xml b/res/xml/setting_menu_preferences.xml index 7bdbca9f0..da0a21154 100755 --- a/res/xml/setting_menu_preferences.xml +++ b/res/xml/setting_menu_preferences.xml @@ -492,5 +492,14 @@ android:layout="@layout/preference" android:summary="%s"/> + <ListPreference + android:key="pref_camera2_abort_captures_key" + android:defaultValue="@string/pref_camera2_abort_captures_default" + android:title="@string/pref_camera2_abort_captures_title" + android:entries="@array/pref_camera2_abort_captures_entries" + android:entryValues="@array/pref_camera2_abort_captures_entryvalues" + android:layout="@layout/preference" + android:summary="%s"/> + </PreferenceCategory> </PreferenceScreen> |