diff options
author | Camera Software Integration <camswint@localhost> | 2016-06-07 22:48:56 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-06-07 22:48:56 -0700 |
commit | 78b783a4bdea2a248774125307c3c0437f720a06 (patch) | |
tree | f251cd641deec7c767f7292b6a36a336248b21a4 /res | |
parent | 1db6b32f781ac83ca8b7913154a72f2de01acd67 (diff) | |
parent | 421cebf7c24fcf0fc4def96165729e938a49fc93 (diff) | |
download | android_packages_apps_Snap-78b783a4bdea2a248774125307c3c0437f720a06.tar.gz android_packages_apps_Snap-78b783a4bdea2a248774125307c3c0437f720a06.tar.bz2 android_packages_apps_Snap-78b783a4bdea2a248774125307c3c0437f720a06.zip |
Merge "SnapdragonCamera: Update settingsManager and add Dual mode to Scene mode" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'res')
-rw-r--r-- | res/values/camera2arrays.xml | 71 | ||||
-rw-r--r-- | res/values/qcomstrings.xml | 12 | ||||
-rw-r--r-- | res/xml/capture_preferences.xml | 24 |
3 files changed, 49 insertions, 58 deletions
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml index f4ac13e8c..8e54a2abc 100644 --- a/res/values/camera2arrays.xml +++ b/res/values/camera2arrays.xml @@ -38,31 +38,36 @@ <item>@string/pref_camera2_camera2_value_enable</item> </string-array> - <string-array name="pref_camera2_dual_camera_entries" translatable="true"> - <item>@string/pref_camera2_dual_camera_entry_dual</item> - <item>@string/pref_camera2_dual_camera_entry_bayer</item> - <item>@string/pref_camera2_dual_camera_entry_mono</item> + <string-array name="pref_camera2_mono_only_entries" translatable="true"> + <item>On</item> + <item>Off</item> </string-array> - <string-array name="pref_camera2_dual_camera_entryvalues" translatable="false"> - <item>0</item> - <item>1</item> - <item>2</item> + <string-array name="pref_camera2_mono_only_entryvalues" translatable="false"> + <item>on</item> + <item>off</item> + </string-array> + + <string-array name="pref_camera2_initial_camera_entries" translatable="true"> + <item>Bayer</item> + <item>Mono</item> + <item>Front</item> </string-array> - <string-array name="pref_camera2_dual_camera_dependencylist" translatable="false"> - <item>pref_camera2_mono_preview_key</item> - <item>pref_camera2_clearsight_key</item> + <string-array name="pref_camera2_initial_camera_entryvalues" translatable="false"> + <item>bayer</item> + <item>mono</item> + <item>front</item> </string-array> <string-array name="pref_camera2_mono_preview_entries" translatable="true"> - <item>@string/pref_camera2_mono_preview_entry_off</item> <item>@string/pref_camera2_mono_preview_entry_on</item> + <item>@string/pref_camera2_mono_preview_entry_off</item> </string-array> <string-array name="pref_camera2_mono_preview_entryvalues" translatable="false"> - <item>@string/pref_camera2_mono_preview_value_off</item> <item>@string/pref_camera2_mono_preview_value_on</item> + <item>@string/pref_camera2_mono_preview_value_off</item> </string-array> <string-array name="pref_camera2_clearsight_entries" translatable="true"> @@ -75,18 +80,14 @@ <item>@string/pref_camera2_clearsight_value_on</item> </string-array> - <string-array name="pref_camera2_scenemode_dependencylist" translatable="false"> - <item>pref_camera2_coloreffect_key</item> - <item>pref_camera2_flashmode_key</item> - <item>pref_camera2_whitebalance_key</item> - </string-array> - <!-- Refer to CONTROL_SCENE_MODE of Camera2 API for values -1 refers to ones not supported in Camera2 API 0 is special case added for auto (meaning off) + -5 is for dual mode --> <string-array name="pref_camera2_scenemode_entryvalues" translatable="false"> <item>0</item> + <item>-5</item> <item>18</item> <item>-1</item> <item>-1</item> @@ -106,6 +107,7 @@ <!-- Camera Preferences Scene Mode dialog box entries --> <string-array name="pref_camera2_scenemode_entries" translatable="false"> <item>@string/pref_camera_scenemode_entry_auto</item> + <item>Dual</item> <item>@string/pref_camera_scenemode_entry_hdr</item> <item>@string/pref_camera_scenemode_entry_refocus</item> <item>@string/pref_camera_scenemode_entry_optizoom</item> @@ -125,6 +127,7 @@ <array name="pref_camera2_scenemode_thumbnails" translatable="false"> <item>@drawable/ic_scene_mode_auto</item> <item>@drawable/ic_scene_mode_hdr</item> + <item>@drawable/ic_scene_mode_hdr</item> <item>@drawable/ic_scene_mode_refocus</item> <item>@drawable/ic_scene_mode_optizoom</item> <item>@drawable/ic_scene_mode_portrait</item> @@ -140,51 +143,35 @@ <item>@drawable/ic_scene_mode_smartauto</item> </array> - <string-array name="pref_camera2_scenemode_labels"> - <item>@string/pref_camera_scenemode_label_action</item> - <item>@string/pref_camera_scenemode_label_night</item> - <item>@string/pref_camera_scenemode_label_auto</item> - <item>@string/pref_camera_scenemode_label_sunset</item> - <item>@string/pref_camera_scenemode_label_party</item> - </string-array> - - <array name="pref_camera2_scenemode_icons"> - <item>@drawable/ic_sce_action</item> - <item>@drawable/ic_sce_night</item> - <item>@drawable/ic_sce_off</item> - <item>@drawable/ic_sce_sunset</item> - <item>@drawable/ic_sce_party</item> - </array> - <string-array name="pref_camera2_whitebalance_entryvalues" translatable="false"> + <item>1</item> <item>2</item> <item>4</item> - <item>1</item> <item>5</item> <item>6</item> </string-array> <!-- Camera Preferences White Balance dialog box entries --> <string-array name="pref_camera2_whitebalance_entries" translatable="false"> + <item>@string/pref_camera_whitebalance_entry_auto</item> <item>@string/pref_camera_whitebalance_entry_incandescent</item> <item>@string/pref_camera_whitebalance_entry_fluorescent</item> - <item>@string/pref_camera_whitebalance_entry_auto</item> <item>@string/pref_camera_whitebalance_entry_daylight</item> <item>@string/pref_camera_whitebalance_entry_cloudy</item> </string-array> <string-array name="pref_camera2_whitebalance_labels" translatable="false"> + <item>@string/pref_camera_whitebalance_label_auto</item> <item>@string/pref_camera_whitebalance_label_incandescent</item> <item>@string/pref_camera_whitebalance_label_fluorescent</item> - <item>@string/pref_camera_whitebalance_label_auto</item> <item>@string/pref_camera_whitebalance_label_daylight</item> <item>@string/pref_camera_whitebalance_label_cloudy</item> </string-array> <array name="pref_camera2_whitebalance_icons" translatable="false"> + <item>@drawable/ic_wb_auto</item> <item>@drawable/ic_wb_incandescent</item> <item>@drawable/ic_wb_fluorescent</item> - <item>@drawable/ic_wb_auto</item> <item>@drawable/ic_wb_sunlight</item> <item>@drawable/ic_wb_cloudy</item> </array> @@ -287,9 +274,9 @@ </string-array> <string-array name="pref_camera2_flashmode_entryvalues" translatable="false"> - <item>off</item> - <item>auto</item> - <item>on</item> + <item>1</item> + <item>2</item> + <item>3</item> </string-array> <array name="pref_camera2_flashmode_icons" translatable="false"> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index b600083f9..974ac2356 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -956,11 +956,8 @@ <string name="pref_camera2_camera2_value_enable" translatable="false">enable</string> <string name="pref_camera2_camera2_value_disable" translatable="false">disable</string> - <string name="pref_camera2_dual_camera_title" translatable="true">Dual Camera Mode</string> - <string name="pref_camera2_dual_camera_entry_dual" translatable="true">Dual-camera Linked</string> - <string name="pref_camera2_dual_camera_entry_bayer" translatable="true">Single Bayer Camera</string> - <string name="pref_camera2_dual_camera_entry_mono" translatable="true">Single Mono Camera</string> - <string name="pref_camera2_dual_camera_default" translatable="false">1</string> + <string name="pref_camera2_mono_only_title" translatable="true">Mono Only</string> + <string name="pref_camera2_mono_only_default" translatable="false">off</string> <string name="pref_camera2_mono_preview_title" translatable="true">Mono Preview</string> <string name="pref_camera2_mono_preview_entry_on" translatable="true">On</string> @@ -970,7 +967,7 @@ <string name="pref_camera2_mono_preview_value_off" translatable="false">off</string> <string name="pref_camera2_clearsight_title" translatable="true">ClearSight</string> - <string name="pref_camera2_clearsight_default" translatable="false">off</string> + <string name="pref_camera2_clearsight_default" translatable="false">on</string> <string name="pref_camera2_clearsight_entry_on" translatable="false">On</string> <string name="pref_camera2_clearsight_entry_off" translatable="false">Off</string> @@ -981,5 +978,8 @@ <string name="clearsight_capture_fail">ClearSight capture failed</string> <string name="pref_camera2_scenemode_default" translatable="false">0</string> + <string name="pref_camera2_whitebalance_default" translatable="false">1</string> + <string name="pref_camera2_coloreffect_default" translatable="false">0</string> + <string name="pref_camera2_flashmode_default" translatable="false">2</string> </resources> diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml index 3bab09eb0..3dad3a701 100644 --- a/res/xml/capture_preferences.xml +++ b/res/xml/capture_preferences.xml @@ -31,7 +31,7 @@ xmlns:camera="http://schemas.android.com/apk/res/org.codeaurora.snapcam" camera:title="@string/pref_camera_settings_category"> <IconListPreference - camera:defaultValue="@string/pref_camera_flashmode_default" + camera:defaultValue="@string/pref_camera2_flashmode_default" camera:entries="@array/pref_camera2_flashmode_entries" camera:entryValues="@array/pref_camera2_flashmode_entryvalues" camera:icons="@array/pref_camera2_flashmode_icons" @@ -42,7 +42,7 @@ camera:title="@string/pref_camera_flashmode_title"/> <IconListPreference - camera:defaultValue="@string/pref_camera_whitebalance_default" + camera:defaultValue="@string/pref_camera2_whitebalance_default" camera:entries="@array/pref_camera2_whitebalance_entries" camera:entryValues="@array/pref_camera2_whitebalance_entryvalues" camera:icons="@array/pref_camera2_whitebalance_icons" @@ -87,12 +87,11 @@ camera:title="@string/pref_camera2_camera2_title"/> <ListPreference - camera:defaultValue="@string/pref_camera2_dual_camera_default" - camera:dependencyList="@array/pref_camera2_dual_camera_dependencylist" - camera:entries="@array/pref_camera2_dual_camera_entries" - camera:entryValues="@array/pref_camera2_dual_camera_entryvalues" - camera:key="pref_camera2_dual_camera_key" - camera:title="@string/pref_camera2_dual_camera_title"/> + camera:defaultValue="@string/pref_camera2_mono_only_default" + camera:entries="@array/pref_camera2_mono_only_entries" + camera:entryValues="@array/pref_camera2_mono_only_entryvalues" + camera:key="pref_camera2_mono_only_key" + camera:title="@string/pref_camera2_mono_only_title"/> <ListPreference camera:defaultValue="@string/pref_camera2_mono_preview_default" @@ -109,7 +108,7 @@ camera:title="@string/pref_camera2_clearsight_title"/> <IconListPreference - camera:defaultValue="@string/pref_camera_coloreffect_default" + camera:defaultValue="@string/pref_camera2_coloreffect_default" camera:entries="@array/pref_camera2_coloreffect_entries" camera:entryValues="@array/pref_camera2_coloreffect_entryvalues" camera:key="pref_camera2_coloreffect_key" @@ -120,7 +119,6 @@ <IconListPreference camera:defaultValue="@string/pref_camera2_scenemode_default" - camera:dependencyList="@array/pref_camera2_scenemode_dependencylist" camera:entries="@array/pref_camera2_scenemode_entries" camera:entryValues="@array/pref_camera2_scenemode_entryvalues" camera:key="pref_camera2_scenemode_key" @@ -179,4 +177,10 @@ camera:key="pref_camera2_timer_key" camera:singleIcon="@drawable/ic_settings_countdowntimer" camera:title="@string/pref_camera_timer_title"/> + + <ListPreference + camera:defaultValue="0" + camera:key="pref_camera2_initial_camera_key" + camera:entries="@array/pref_camera2_initial_camera_entries" + camera:entryValues="@array/pref_camera2_initial_camera_entryvalues"/> </PreferenceGroup> |