diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-05 13:57:24 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-05 13:57:24 -0800 |
| commit | 1ec923e6fd96d396767f8b7e818b5854ae8bf821 (patch) | |
| tree | b0b622a7c8af3360c96bd707e24ed54c07d8df0e /res | |
| parent | 2f89961fd763d226b2f4a595bfb77e1a491c01e5 (diff) | |
| parent | d92a952b0cfe8e570f85112bc9a4c65729e7ffed (diff) | |
| download | android_packages_apps_Snap-1ec923e6fd96d396767f8b7e818b5854ae8bf821.tar.gz android_packages_apps_Snap-1ec923e6fd96d396767f8b7e818b5854ae8bf821.tar.bz2 android_packages_apps_Snap-1ec923e6fd96d396767f8b7e818b5854ae8bf821.zip | |
Merge "SnapdragonCamera:Add instant AEC to developer option" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'res')
| -rwxr-xr-x[-rw-r--r--] | res/values/camera2arrays.xml | 12 | ||||
| -rwxr-xr-x[-rw-r--r--] | res/values/qcomstrings.xml | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | res/xml/capture_preferences.xml | 7 | ||||
| -rwxr-xr-x[-rw-r--r--] | res/xml/setting_menu_preferences.xml | 15 |
4 files changed, 40 insertions, 0 deletions
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml index fbb70b984..ca6234944 100644..100755 --- a/res/values/camera2arrays.xml +++ b/res/values/camera2arrays.xml @@ -946,4 +946,16 @@ for time lapse recording --> <item>@string/pref_camera2_shutter_sound_value_on</item> <item>@string/pref_camera2_shutter_sound_value_off</item> </string-array> + + <string-array name="pref_camera2_instant_aec_entryvalues" translatable="false"> + <item>0</item> + <item>1</item> + <item>2</item> + </string-array> + + <string-array name="pref_camera2_instant_aec_entries" translatable="true"> + <item>@string/pref_camera2_instant_aec_entry_disable</item> + <item>@string/pref_camera2_instant_aec_entry_aggressive</item> + <item>@string/pref_camera2_instant_aec_entry_fast</item> + </string-array> </resources> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 509fae318..526e72021 100644..100755 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -1080,5 +1080,11 @@ <string name="pref_camera2_not_show_again">Do not show again</string> <string name="pref_camera2_scene_mode_instructional_ok" translatable="true">OK</string> + + <string name="pref_camera2_instant_aec_title" translatable="true">Instant AEC</string> + <string name="pref_camera2_instant_aec_default" translatable="false">0</string> + <string name="pref_camera2_instant_aec_entry_disable" translatable="true">Disable</string> + <string name="pref_camera2_instant_aec_entry_aggressive" translatable="true">Aggressive AEC</string> + <string name="pref_camera2_instant_aec_entry_fast" translatable="true">Fast AEC</string> </resources> diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml index 8ad300fe7..cab23a027 100644..100755 --- a/res/xml/capture_preferences.xml +++ b/res/xml/capture_preferences.xml @@ -300,4 +300,11 @@ camera:entryValues="@array/pref_camera2_shutter_sound_entryvalues" camera:key="pref_camera2_shutter_sound_key" camera:title="@string/pref_camera2_shutter_sound_title" /> + + <ListPreference + camera:defaultValue="@string/pref_camera2_instant_aec_default" + camera:entries="@array/pref_camera2_instant_aec_entries" + camera:entryValues="@array/pref_camera2_instant_aec_entryvalues" + camera:key="pref_camera2_instant_aec_key" + camera:title="@string/pref_camera2_instant_aec_title" /> </PreferenceGroup> diff --git a/res/xml/setting_menu_preferences.xml b/res/xml/setting_menu_preferences.xml index 80097f497..7c03e589d 100644..100755 --- a/res/xml/setting_menu_preferences.xml +++ b/res/xml/setting_menu_preferences.xml @@ -275,4 +275,19 @@ android:summary="Version" android:title="Version Info" /> </PreferenceCategory> + + <PreferenceCategory + android:key="developer" + android:layout="@layout/preferences_category" + android:title="DEVELOPER OPTIONS"> + + <ListPreference + android:defaultValue="@string/pref_camera2_instant_aec_default" + android:entries="@array/pref_camera2_instant_aec_entries" + android:entryValues="@array/pref_camera2_instant_aec_entryvalues" + android:key="pref_camera2_instant_aec_key" + android:layout="@layout/preference" + android:summary="%s" + android:title="@string/pref_camera2_instant_aec_title" /> + </PreferenceCategory> </PreferenceScreen> |