summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJack Yoo <jyoo@codeaurora.org>2016-07-13 14:49:22 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-08-16 16:10:03 -0700
commit7d80bdb6ca1db08ecd29389ac7f263ecff6c5b70 (patch)
treeddbfe6349ed8f7b619817b0c84f6c2105793d499 /res
parentbec67f460a2acb5d239ab5455a8eb0b8a66cfe23 (diff)
downloadandroid_packages_apps_Snap-7d80bdb6ca1db08ecd29389ac7f263ecff6c5b70.tar.gz
android_packages_apps_Snap-7d80bdb6ca1db08ecd29389ac7f263ecff6c5b70.tar.bz2
android_packages_apps_Snap-7d80bdb6ca1db08ecd29389ac7f263ecff6c5b70.zip
SnapdragonCamera: Selfie Mirror mode
Selfie mirror menu for front camera1. Change-Id: I2e6845c9e25481106f51772b5d3dfd0a971a2be7 CRs-Fixed: 1050663
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/ic_settings_selfiemirror.pngbin0 -> 1480 bytes
-rw-r--r--res/drawable-xhdpi/ic_settings_selfiemirror.pngbin0 -> 2329 bytes
-rw-r--r--res/drawable-xxhdpi/ic_settings_selfiemirror.pngbin0 -> 3215 bytes
-rw-r--r--res/values/qcomarrays.xml10
-rw-r--r--res/values/qcomstrings.xml6
-rw-r--r--res/xml/camera_preferences.xml7
6 files changed, 23 insertions, 0 deletions
diff --git a/res/drawable-hdpi/ic_settings_selfiemirror.png b/res/drawable-hdpi/ic_settings_selfiemirror.png
new file mode 100644
index 000000000..c6d0f8be7
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_selfiemirror.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_selfiemirror.png b/res/drawable-xhdpi/ic_settings_selfiemirror.png
new file mode 100644
index 000000000..975448e94
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_selfiemirror.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_selfiemirror.png b/res/drawable-xxhdpi/ic_settings_selfiemirror.png
new file mode 100644
index 000000000..b49b6fa4a
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_selfiemirror.png
Binary files differ
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index 7574992b9..4858ab3c0 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -587,6 +587,16 @@
<item>disable</item>
<item>enable</item>
</string-array>
+
+ <string-array name="pref_camera_selfiemirror_entries" translatable="false">
+ <item>@string/pref_camera_selfiemirror_entry_disable</item>
+ <item>@string/pref_camera_selfiemirror_entry_enable</item>
+ </string-array>
+ <string-array name="pref_camera_selfiemirror_entryvalues" translatable="false">
+ <item>disable</item>
+ <item>enable</item>
+ </string-array>
+
<!-- Camera Preferences Selectable Zone AF dialog box entries -->
<string-array name="pref_camera_selectablezoneaf_entries" translatable="false">
<item>@string/pref_camera_selectablezoneaf_entry_auto</item>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 0fb750590..e03a47344 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -322,6 +322,12 @@
<!-- Settings menu, redeye reduction choices -->
<string name="pref_camera_redeyereduction_entry_enable">Enable</string>
<string name="pref_camera_redeyereduction_entry_disable">Disable</string>
+
+ <string name="pref_camera_selfiemirror_default" translatable="false">disable</string>
+ <string name="pref_camera_selfiemirror_title" translatable="true">Selfie Mirror</string>
+ <string name="pref_camera_selfiemirror_entry_enable">Enable</string>
+ <string name="pref_camera_selfiemirror_entry_disable">Disable</string>
+
<!-- Default mce setting. Do not translate. -->
<string name="pref_camera_mce_default">enable</string>
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 7e024b298..9c6d64670 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -285,6 +285,13 @@
camera:entries="@array/pref_camera_redeyereduction_entries"
camera:singleIcon="@drawable/ic_settings_redeye"
camera:entryValues="@array/pref_camera_redeyereduction_entryvalues" />
+ <IconListPreference
+ camera:key="pref_camera_selfiemirror_key"
+ camera:defaultValue="@string/pref_camera_selfiemirror_default"
+ camera:title="@string/pref_camera_selfiemirror_title"
+ camera:entries="@array/pref_camera_selfiemirror_entries"
+ camera:singleIcon="@drawable/ic_settings_selfiemirror"
+ camera:entryValues="@array/pref_camera_selfiemirror_entryvalues" />
<ListPreference
camera:key="pref_camera_selectablezoneaf_key"
camera:defaultValue="@string/pref_camera_selectablezoneaf_default"