summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorCamera Software Integration <camswint@localhost>2015-11-10 10:06:42 -0800
committerCamera Software Integration <camswint@localhost>2015-12-22 16:24:43 +0530
commit956aaa62fec3b4379103515b02eb5459b3fad92f (patch)
tree0556ed02b6f633e95782b1b840a8507c9d21bc2b /res
parentd074a0ed7d81cbad424f738df27766bbba496ffa (diff)
downloadandroid_packages_apps_Snap-956aaa62fec3b4379103515b02eb5459b3fad92f.zip
android_packages_apps_Snap-956aaa62fec3b4379103515b02eb5459b3fad92f.tar.gz
android_packages_apps_Snap-956aaa62fec3b4379103515b02eb5459b3fad92f.tar.bz2
SnapdragonCamera: Moving Image Stabilization option to the menu
Moving Image Stabilization option to the menu Change-Id: I7fb025a3d1909af436e7a52ee9d602b2ce2dc68b CRs-Fixed: 937237
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/ic_eis_menu.pngbin0 -> 3364 bytes
-rw-r--r--res/drawable-xhdpi/ic_eis_menu.pngbin0 -> 4387 bytes
-rw-r--r--res/drawable-xxhdpi/ic_eis_menu.pngbin0 -> 6783 bytes
-rw-r--r--res/values/qcomstrings.xml6
-rw-r--r--res/values/strings.xml2
-rw-r--r--res/xml/video_preferences.xml3
6 files changed, 6 insertions, 5 deletions
diff --git a/res/drawable-hdpi/ic_eis_menu.png b/res/drawable-hdpi/ic_eis_menu.png
new file mode 100644
index 0000000..292be7a
--- /dev/null
+++ b/res/drawable-hdpi/ic_eis_menu.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_eis_menu.png b/res/drawable-xhdpi/ic_eis_menu.png
new file mode 100644
index 0000000..01c0a6d
--- /dev/null
+++ b/res/drawable-xhdpi/ic_eis_menu.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_eis_menu.png b/res/drawable-xxhdpi/ic_eis_menu.png
new file mode 100644
index 0000000..62746e1
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_eis_menu.png
Binary files differ
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 414d8f9..388ac0a 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -314,13 +314,13 @@
<string name="pref_camera_mce_default">enable</string>
<!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
- <string name="error_app_unsupported_hfr_selection">HFR/HSR is not supported for DIS/TimeLapse/HDR</string>
+ <string name="error_app_unsupported_hfr_selection">HFR/HSR is not supported for Image Stabilization/TimeLapse/HDR</string>
<!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
<string name="error_app_unsupported_hfr">HFR is not supported for selected resolution</string>
<!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
- <string name="error_app_unsupported_dis">Unsupported video resolution for Display Image Stabilization(DIS)</string>
+ <string name="error_app_unsupported_dis">Unsupported video resolution for Image Stabilization</string>
<!-- The message is shown in dialog when the app
encounters an unsupported resolution for HSR mode -->
@@ -504,7 +504,7 @@
<string name="pref_camera_touchafaec_entry_on">On</string>
<!-- Select IS title -->
- <string name="pref_camera_dis_title">IS</string>
+ <string name="pref_camera_dis_title">Image Stabilization</string>
<string name="pref_camera_dis_default">disable</string>
<!-- DIS choices -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1fe80ab..a676d9c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -437,7 +437,7 @@
<string name="advanced_capture_disable_continuous_shot">Enable Advanced Capture will disable Continuous Shot.</string>
<!-- Toast after enable 2k4k video quality to inform IS has disabled -->
- <string name="video_quality_4k_disable_IS">Enable 4k video quality will disable IS.</string>
+ <string name="video_quality_4k_disable_IS">Enable 4k video quality will disable Image Stabilization.</string>
<!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
<string name="video_quality_4k_disable_SeeMore">SeeMore cannot be enabled during 4k video.</string>
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index 63346a0..f9949d4 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -111,11 +111,12 @@
camera:title="@string/pref_camera_powermode_title"
camera:entries="@array/pref_camera_powermode_entries"
camera:entryValues="@array/pref_camera_powermode_entryvalues" />
- <ListPreference
+ <IconListPreference
camera:key="pref_camera_dis_key"
camera:defaultValue="@string/pref_camera_dis_default"
camera:title="@string/pref_camera_dis_title"
camera:entries="@array/pref_camera_dis_entries"
+ camera:singleIcon="@drawable/ic_eis_menu"
camera:entryValues="@array/pref_camera_dis_entryvalues" />
<IconListPreference
camera:key="pref_camera_coloreffect_key"