diff options
author | Likai Ding <likaid@codeaurora.org> | 2015-05-27 15:59:04 +0800 |
---|---|---|
committer | Likai Ding <likaid@codeaurora.org> | 2015-05-27 15:59:04 +0800 |
commit | 36cfd9c72b8ed4ddce7625cc01641f2235bb473c (patch) | |
tree | c9a702ba7b993116b1fd5329a9ee533a10a5aad5 /res | |
parent | da42b04ba6c0c3ec0b3f7e71ca5a277274443f89 (diff) | |
download | android_packages_apps_Snap-36cfd9c72b8ed4ddce7625cc01641f2235bb473c.tar.gz android_packages_apps_Snap-36cfd9c72b8ed4ddce7625cc01641f2235bb473c.tar.bz2 android_packages_apps_Snap-36cfd9c72b8ed4ddce7625cc01641f2235bb473c.zip |
SnapdragonCamera: implement optizoom and chromaflash UI
add scene mode for optizoom and preference entry for chromaflash
Change-Id: I859a42e3273d340a7dda7e24c6cb2e08ddb0f7bf
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/ic_scene_mode_optizoom.png | bin | 0 -> 4076 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_settings_chromaflash.png | bin | 0 -> 3041 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_scene_mode_optizoom.png | bin | 0 -> 5520 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_settings_chromaflash.png | bin | 0 -> 4055 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_scene_mode_optizoom.png | bin | 0 -> 8137 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_settings_chromaflash.png | bin | 0 -> 5787 bytes | |||
-rw-r--r-- | res/values/arrays.xml | 13 | ||||
-rw-r--r-- | res/values/strings.xml | 1 | ||||
-rw-r--r-- | res/xml/camera_preferences.xml | 7 |
9 files changed, 21 insertions, 0 deletions
diff --git a/res/drawable-hdpi/ic_scene_mode_optizoom.png b/res/drawable-hdpi/ic_scene_mode_optizoom.png Binary files differnew file mode 100644 index 000000000..bdf3d634a --- /dev/null +++ b/res/drawable-hdpi/ic_scene_mode_optizoom.png diff --git a/res/drawable-hdpi/ic_settings_chromaflash.png b/res/drawable-hdpi/ic_settings_chromaflash.png Binary files differnew file mode 100644 index 000000000..a58bc00bf --- /dev/null +++ b/res/drawable-hdpi/ic_settings_chromaflash.png diff --git a/res/drawable-xhdpi/ic_scene_mode_optizoom.png b/res/drawable-xhdpi/ic_scene_mode_optizoom.png Binary files differnew file mode 100644 index 000000000..8a4fc3614 --- /dev/null +++ b/res/drawable-xhdpi/ic_scene_mode_optizoom.png diff --git a/res/drawable-xhdpi/ic_settings_chromaflash.png b/res/drawable-xhdpi/ic_settings_chromaflash.png Binary files differnew file mode 100644 index 000000000..b21a5a086 --- /dev/null +++ b/res/drawable-xhdpi/ic_settings_chromaflash.png diff --git a/res/drawable-xxhdpi/ic_scene_mode_optizoom.png b/res/drawable-xxhdpi/ic_scene_mode_optizoom.png Binary files differnew file mode 100644 index 000000000..e41b3ac23 --- /dev/null +++ b/res/drawable-xxhdpi/ic_scene_mode_optizoom.png diff --git a/res/drawable-xxhdpi/ic_settings_chromaflash.png b/res/drawable-xxhdpi/ic_settings_chromaflash.png Binary files differnew file mode 100644 index 000000000..d46fc49c6 --- /dev/null +++ b/res/drawable-xxhdpi/ic_settings_chromaflash.png diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 96234eda8..12eaeec81 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -394,11 +394,22 @@ <item>@drawable/ic_indicator_wb_cloudy</item> </array> + <string-array name="pref_camera_chromaflash_entries" translatable="false"> + <item>@string/setting_off</item> + <item>@string/setting_on</item> + </string-array> + + <array name="pref_camera_chromaflash_entryvalues" translatable="false"> + <item>@string/pref_camera_advanced_feature_value_chromaflash_off</item> + <item>@string/pref_camera_advanced_feature_value_chromaflash_on</item> + </array> + <!-- 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_hdr</item> <item>@string/pref_camera_scenemode_entry_refocus</item> + <item>@string/pref_camera_scenemode_entry_optizoom</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> @@ -415,6 +426,7 @@ <item>@drawable/ic_scene_mode_auto</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> <item>@drawable/ic_scene_mode_landscape</item> <item>@drawable/ic_scene_mode_sports</item> @@ -447,6 +459,7 @@ <item>auto</item> <item>hdr</item> <item>@string/pref_camera_advanced_feature_value_refocus_on</item> + <item>@string/pref_camera_advanced_feature_value_optizoom_on</item> <item>portrait</item> <item>landscape</item> <item>sports</item> diff --git a/res/values/strings.xml b/res/values/strings.xml index 6959a4253..4ead3ba40 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -398,6 +398,7 @@ <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> + <string name="pref_camera_scenemode_entry_optizoom">Opti-Zoom</string> <!-- Settings menu, scene mode labels [CHAR LIMIT=50] --> <string name="pref_camera_scenemode_label_auto">NONE</string> diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index 6fc88a35f..caf2a93d7 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -50,6 +50,13 @@ camera:entries="@array/pref_camera_whitebalance_entries" camera:entryValues="@array/pref_camera_whitebalance_entryvalues" camera:labelList="@array/pref_camera_whitebalance_labels" /> + <IconListPreference + camera:key="chroma-flash" + camera:defaultValue="@string/pref_camera_advanced_feature_value_chromaflash_off" + camera:title="@string/pref_camera_advanced_feature_entry_chromaflash" + camera:singleIcon="@drawable/ic_settings_chromaflash" + camera:entries="@array/pref_camera_chromaflash_entries" + camera:entryValues="@array/pref_camera_chromaflash_entryvalues" /> <RecordLocationPreference camera:key="pref_camera_recordlocation_key" camera:defaultValue="@string/pref_camera_recordlocation_default" |