summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorLikai Ding <likaid@codeaurora.org>2014-12-10 18:09:27 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2015-01-14 02:10:45 -0800
commit762b4350b731e1c2189c871dc77627df2be87549 (patch)
tree53c044e25c0c270b98bef785a86b74d04a00149d /res/values
parentee168be7e40e15c1921b32f6b863ad3843c91bfd (diff)
downloadandroid_packages_apps_Snap-762b4350b731e1c2189c871dc77627df2be87549.tar.gz
android_packages_apps_Snap-762b4350b731e1c2189c871dc77627df2be87549.tar.bz2
android_packages_apps_Snap-762b4350b731e1c2189c871dc77627df2be87549.zip
SnapdragonCamera: implement refocus feature
Add a scene mode for refocus. If the latest photo is taken with refocus, user can click on the preview thumbnail, then refocus it by tapping on the photo. Change-Id: I2fd69439467f5a1e33d23d8d239aa3472d88b585
Diffstat (limited to 'res/values')
-rw-r--r--res/values/arrays.xml3
-rw-r--r--res/values/qcomstrings.xml4
-rw-r--r--res/values/strings.xml4
3 files changed, 10 insertions, 1 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 581146cc6..bb87126b2 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -397,6 +397,7 @@
<!-- Camera Preferences Scene Mode dialog box entries -->
<string-array name="pref_camera_scenemode_entries" translatable="false">
<item>@string/pref_camera_scenemode_entry_auto</item>
+ <item>@string/pref_camera_scenemode_entry_refocus</item>
<!-- <item>@string/pref_camera_scenemode_entry_portrait</item> -->
<item>@string/pref_camera_scenemode_entry_landscape</item>
<item>@string/pref_camera_scenemode_entry_sports</item>
@@ -411,6 +412,7 @@
<array name="scenemode_thumbnails" translatable="false">
<item>@drawable/ic_scene_mode_auto</item>
+ <item>@drawable/ic_scene_mode_refocus</item>
<!-- <item>@drawable/ic_scene_mode_portrait</item> -->
<item>@drawable/ic_scene_mode_landscape</item>
<item>@drawable/ic_scene_mode_sports</item>
@@ -441,6 +443,7 @@
<string-array name="pref_camera_scenemode_entryvalues" translatable="false">
<item>auto</item>
+ <item>@string/pref_camera_advanced_feature_value_refocus_on</item>
<!-- <item>portrait</item> -->
<item>landscape</item>
<item>sports</item>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 77a905ae3..6ba2af63f 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -1,5 +1,5 @@
<!--
- Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+ Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
Not a Contribution.
@@ -865,5 +865,7 @@
<!-- The alas of CameraActivity for gesture operation -->
<string name="camera_gesture_title">Launch camera</string>
+
+ <string name="all_in_focus">All in Focus</string>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0ad549a41..33597b74b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -396,6 +396,8 @@
<string name="pref_camera_scenemode_entry_sunset">Sunset</string>
<!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=16] -->
<string name="pref_camera_scenemode_entry_party">Party</string>
+ <!-- Scene mode for refocus feature [CHAR LIMIT=16] -->
+ <string name="pref_camera_scenemode_entry_refocus">Macro+</string>
<!-- Settings menu, scene mode labels [CHAR LIMIT=50] -->
<string name="pref_camera_scenemode_label_auto">NONE</string>
@@ -714,4 +716,6 @@ CHAR LIMIT = NONE] -->
<string name="pref_camera_video_rotation_label_270">270</string>
<string name="remaining_photos_format">%d left</string>
+
+ <string name="refocus_toast">To re-focus last photo, tap here</string>
</resources>