summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJack Yoo <jyoo@codeaurora.org>2016-09-26 13:21:57 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-10-13 15:56:58 -0700
commitaa24e964a6c6f7849ba843a37df1387c0894d725 (patch)
treebae3f952ba0e74a1639b5931fa297de7f2bfa34c /res
parente42adc9e85653ed4b9aa1f71b6343bccc28d155c (diff)
downloadandroid_packages_apps_Snap-aa24e964a6c6f7849ba843a37df1387c0894d725.tar.gz
android_packages_apps_Snap-aa24e964a6c6f7849ba843a37df1387c0894d725.tar.bz2
android_packages_apps_Snap-aa24e964a6c6f7849ba843a37df1387c0894d725.zip
SnapdragonCamera: SelfieMirror Camera2
SelfieMirror filter for camera2. Change-Id: Id5fda369a56421199a8c2537491608b8667fb77e CRs-Fixed: 1071798
Diffstat (limited to 'res')
-rw-r--r--res/values/camera2arrays.xml10
-rw-r--r--res/xml/capture_preferences.xml8
-rw-r--r--res/xml/setting_menu_preferences.xml9
3 files changed, 25 insertions, 2 deletions
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml
index 107ae5bb5..438d1389a 100644
--- a/res/values/camera2arrays.xml
+++ b/res/values/camera2arrays.xml
@@ -603,6 +603,16 @@
<item>@string/setting_on_value</item>
</string-array>
+ <string-array name="pref_camera2_selfiemirror_entries" translatable="false">
+ <item>@string/setting_off</item>
+ <item>@string/setting_on</item>
+ </string-array>
+
+ <string-array name="pref_camera2_selfiemirror_entryvalues" translatable="false">
+ <item>@string/setting_off_value</item>
+ <item>@string/setting_on_value</item>
+ </string-array>
+
<string-array name="pref_camera2_filter_mode_entries" translatable="false">
<item>@string/pref_camera_filter_mode_entry_off</item>
<item>@string/pref_camera_filter_mode_entry_on</item>
diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml
index fd1424f50..07c3df83e 100644
--- a/res/xml/capture_preferences.xml
+++ b/res/xml/capture_preferences.xml
@@ -169,6 +169,14 @@
camera:singleIcon="@drawable/ic_settings_continuous"
camera:title="@string/pref_camera_longshot_title"/>
+ <IconListPreference
+ camera:defaultValue="@string/setting_off_value"
+ camera:key="pref_camera2_selfiemirror_key"
+ camera:title="@string/pref_camera_selfiemirror_title"
+ camera:entries="@array/pref_camera2_selfiemirror_entries"
+ camera:singleIcon="@drawable/ic_settings_selfiemirror"
+ camera:entryValues="@array/pref_camera2_selfiemirror_entryvalues" />
+
<CountDownTimerPreference
camera:defaultValue="@string/pref_camera_timer_default"
camera:key="pref_camera2_timer_key"
diff --git a/res/xml/setting_menu_preferences.xml b/res/xml/setting_menu_preferences.xml
index a0c1ac7dc..835fed504 100644
--- a/res/xml/setting_menu_preferences.xml
+++ b/res/xml/setting_menu_preferences.xml
@@ -77,7 +77,12 @@
android:key="pref_camera2_longshot_key"
android:layout="@layout/preference"
android:title="@string/pref_camera_longshot_title" />
-
+ <SwitchPreference
+ android:defaultValue="false"
+ android:icon="@drawable/ic_settings_selfiemirror"
+ android:key="pref_camera2_selfiemirror_key"
+ android:layout="@layout/preference"
+ android:title="@string/pref_camera_selfiemirror_title" />
<ListPreference
android:entries="@array/pref_camera2_picturesize_entries"
android:entryValues="@array/pref_camera2_picturesize_entryvalues"
@@ -263,4 +268,4 @@
android:summary="Version"
android:title="Version Info" />
</PreferenceCategory>
-</PreferenceScreen> \ No newline at end of file
+</PreferenceScreen>