summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorjunjiez <junjiez@codeaurora.org>2016-11-16 11:09:28 +0800
committerweijiew <weijiew@codeaurora.org>2016-12-23 14:29:05 +0800
commitd92a952b0cfe8e570f85112bc9a4c65729e7ffed (patch)
tree61a9612f5f2f194164b0a113f41b8380abf4d5dc /res
parent1fd9901abce1ff4eb09b5aaa3be22e1a0d846ff7 (diff)
downloadandroid_packages_apps_Snap-d92a952b0cfe8e570f85112bc9a4c65729e7ffed.tar.gz
android_packages_apps_Snap-d92a952b0cfe8e570f85112bc9a4c65729e7ffed.tar.bz2
android_packages_apps_Snap-d92a952b0cfe8e570f85112bc9a4c65729e7ffed.zip
SnapdragonCamera:Add instant AEC to developer option
Add instant AEC support to developer option Change-Id: Ia83a724966c453cfeb84e12c1728eab264bed6f8 CRs-Fixed: 1087493
Diffstat (limited to 'res')
-rwxr-xr-x[-rw-r--r--]res/values/camera2arrays.xml12
-rwxr-xr-x[-rw-r--r--]res/values/qcomstrings.xml6
-rwxr-xr-x[-rw-r--r--]res/xml/capture_preferences.xml7
-rwxr-xr-x[-rw-r--r--]res/xml/setting_menu_preferences.xml15
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 9c9d5d26a..31e5475c0 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>