summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorweijiew <weijiew@codeaurora.org>2016-12-02 19:56:28 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-12-05 19:04:51 -0800
commitb39e01c54b0d46b8a005e48e88537bc875b4977b (patch)
tree57cdbafc165c847e6cb8826c3e591d18230c1290 /res/values
parent1faccedafea1dfd535261d5935e457ba353296ef (diff)
downloadandroid_packages_apps_Snap-b39e01c54b0d46b8a005e48e88537bc875b4977b.tar.gz
android_packages_apps_Snap-b39e01c54b0d46b8a005e48e88537bc875b4977b.tar.bz2
android_packages_apps_Snap-b39e01c54b0d46b8a005e48e88537bc875b4977b.zip
SnapdragonCamera: Show label and dialog when switch to new scene mode
Show label and instructional dialog when switch to new scene mode Change-Id: I75becaa9bb898ca9ef68c94b1195069131745f14 CRs-Fixed: 1091210
Diffstat (limited to 'res/values')
-rw-r--r--res/values/camera2arrays.xml53
-rw-r--r--res/values/qcomstrings.xml17
-rw-r--r--res/values/styles.xml14
3 files changed, 84 insertions, 0 deletions
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml
index 31d6b5a62..fbb70b984 100644
--- a/res/values/camera2arrays.xml
+++ b/res/values/camera2arrays.xml
@@ -213,6 +213,59 @@
<item>@drawable/promode</item>
</array>
+ <array name="pref_camera2_scenemode_black_thumbnails" translatable="false">
+ <item>@drawable/ic_scene_mode_black_auto</item>
+ <item>@drawable/ic_scene_mode_black_dual_camera</item>
+ <item>@drawable/ic_scene_mode_black_hdr</item>
+ <item>@drawable/ic_scene_mode_black_ubifocus</item>
+ <item>@drawable/ic_scene_mode_black_optizoom</item>
+ <item>@drawable/ic_scene_mode_black_portrait</item>
+ <item>@drawable/ic_scene_mode_black_landscape</item>
+ <item>@drawable/ic_scene_mode_black_sports</item>
+ <item>@drawable/ic_scene_mode_black_flowers</item>
+ <item>@drawable/ic_scene_mode_black_backlight</item>
+ <item>@drawable/ic_scene_mode_black_candlelight</item>
+ <item>@drawable/ic_scene_mode_black_sunset</item>
+ <item>@drawable/ic_scene_mode_black_night</item>
+ <item>@drawable/ic_scene_mode_black_beach</item>
+ <item>@drawable/ic_scene_mode_black_snow</item>
+ <item>@drawable/ic_scene_mode_smartauto</item>
+ <item>@drawable/ic_scene_mode_black_best_photo</item>
+ <item>@drawable/ic_scene_mode_black_chroma_flash</item>
+ <item>@drawable/ic_scene_mode_black_blur_buster</item>
+ <item>@drawable/ic_scene_mode_black_sharp_photo</item>
+ <item>@drawable/ic_scene_mode_black_tracking_focus</item>
+ <item>@drawable/ic_scene_mode_black_panorama</item>
+ <item>@drawable/ic_scene_mode_black_dual_camera</item>
+ </array>
+
+ <!-- Camera Preferences Scene Mode dialog box entries -->
+ <string-array name="pref_camera2_scenemode_instructional_entries" translatable="false">
+ <item>@string/pref_camera_scenemode_entry_auto</item>
+ <item>@string/pref_camera2_scene_mode_dual_camera_instructional_content</item>
+ <item>@string/pref_camera2_scene_mode_hdr_instructional_content</item>
+ <item>@string/pref_camera2_scene_mode_ubi_focus_instructional_content</item>
+ <item>@string/pref_camera2_scene_mode_opti_zoom_instructional_content</item>
+ <item>""</item>
+ <item>""</item>
+ <item>@string/pref_camera2_scene_mode_sports_instructional_content</item>
+ <item>""</item>
+ <item>""</item>
+ <item>""</item>
+ <item>""</item>
+ <item>""</item>
+ <item>""</item>
+ <item>""</item>
+ <item>""</item>
+ <item>@string/pref_camera2_scene_mode_best_photo_instructional_content</item>
+ <item>@string/pref_camera2_scene_mode_chroma_flash_instructional_content</item>
+ <item>@string/pref_camera2_scene_mode_blur_buster_instructional_content</item>
+ <item>@string/pref_camera2_scene_mode_sharp_photo_instructional_content</item>
+ <item>@string/pref_camera2_scene_mode_tracking_focus_instructional_content</item>
+ <item>@string/pref_camera2_scene_mode_panorama_instructional_content</item>
+ <item>@string/pref_camera2_scene_mode_pro_instructional_content</item>
+ </string-array>
+
<string-array name="pref_camera2_whitebalance_entryvalues" translatable="false">
<item>1</item>
<item>2</item>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index d53b2c27a..509fae318 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -1063,5 +1063,22 @@
<string name="perf_camera2_preferences_category_photo" translatable="true">Still camera</string>
<string name="perf_camera2_preferences_category_video" translatable="true">Video camera</string>
<string name="perf_camera2_preferences_category_system" translatable="true">System</string>
+
+ <string name="pref_camera2_scene_mode_dual_camera_instructional_content" translatable="true">In dual camera mode, your pictures will be clearer. You can also apply background effects, by editing your dual camera pictures in the Gallery.</string>
+ <string name="pref_camera2_scene_mode_ubi_focus_instructional_content" translatable="true">With UbiFocus, your camera will take five pictures and combine them into one picture,where everything is in focus. You can choose to re-focus, after you take the picture.</string>
+ <string name="pref_camera2_scene_mode_opti_zoom_instructional_content" translatable="true">Use Optizoom when you want to zoom in for a clear picture.You can zoom before, or after taking the picture.</string>
+ <string name="pref_camera2_scene_mode_sports_instructional_content" translatable="true">Sports mode helps you take better sports or action shots.\n\nImporves your photos, but has no effect on video recording.</string>
+ <string name="pref_camera2_scene_mode_hdr_instructional_content" translatable="true">When you are in mixed lighting conditions such as low light and backlit scenes select "HDR" for best possible pictures.</string>
+ <string name="pref_camera2_scene_mode_best_photo_instructional_content" translatable="true">Allows you to take a burst of 10 photos, and you can choose the best one(s).</string>
+ <string name="pref_camera2_scene_mode_chroma_flash_instructional_content" translatable="true">With ChromaFlash, the lighting in your flash photos will be optimized for all of the people and objects in your pictures.This feature applies only to the back camera.</string>
+ <string name="pref_camera2_scene_mode_sharp_photo_instructional_content" translatable="true">Sharp Phot reduces blur that is due to motion in the scene, or due to hand motion.</string>
+ <string name="pref_camera2_scene_mode_tracking_focus_instructional_content" translatable="true">Allows you to track and focus a selected person or object while taking pictures or videos. To start, position the focus rectangle on a person or object you want to track.</string>
+ <string name="pref_camera2_scene_mode_time_lapse_instructional_content" translatable="true">With Time Lapse, you can transform a long video recording into a few seconds of video.This effect applies to videos, but not photos.</string>
+ <string name="pref_camera2_scene_mode_panorama_instructional_content" translatable="true">Allows you to pan left or right to take a wide landscape photo. You can alse pan up or down to take tall photos.</string>
+ <string name="pref_camera2_scene_mode_blur_buster_instructional_content" translatable="true">BlurBuster reduces blur from shaky hands.It can be helpful when taking photos in difficult places.</string>
+ <string name="pref_camera2_scene_mode_pro_instructional_content" translatable="true">With Pro Mode, you can manually control settings for ISO,Exposure, White Balance, and Focus. You will have easy access to all of these advanced settings</string>
+
+ <string name="pref_camera2_not_show_again">Do not show again</string>
+ <string name="pref_camera2_scene_mode_instructional_ok" translatable="true">OK</string>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 082c5ed8a..8432c11e9 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -316,4 +316,18 @@
<style name="PanoViewHorizontalBar">
<item name="android:background">@android:color/transparent</item>
</style>
+
+ <style name="OnViewfinderSceneLabel">
+ <item name="android:gravity">center</item>
+ <item name="android:layout_width">wrap_content</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:layout_marginLeft">10dp</item>
+ <item name="android:layout_marginRight">10dp</item>
+ <item name="android:layout_marginTop">5dp</item>
+ <item name="android:layout_marginBottom">5dp</item>
+ <item name="android:singleLine">true</item>
+ <item name="android:textColor">@android:color/white</item>
+ <item name="android:textSize">16dp</item>
+ <item name="android:background">@android:color/transparent</item>
+ </style>
</resources>