diff options
author | Sascha Haeberling <haeberling@google.com> | 2013-09-24 18:58:34 -0700 |
---|---|---|
committer | Sascha Haeberling <haeberling@google.com> | 2013-09-24 21:42:10 -0700 |
commit | 98f38bb04daa3db49a072718cd8b5005b8b73af1 (patch) | |
tree | 09f64d1dfdf0837a3f042fae987de58ccc54c625 /res | |
parent | 4601f5d987ad2f57db6b1b65a716f00308e5ae99 (diff) | |
download | android_packages_apps_Snap-98f38bb04daa3db49a072718cd8b5005b8b73af1.tar.gz android_packages_apps_Snap-98f38bb04daa3db49a072718cd8b5005b8b73af1.tar.bz2 android_packages_apps_Snap-98f38bb04daa3db49a072718cd8b5005b8b73af1.zip |
Add HQ option and use it to switch to GCam.
Bug: 10430748
Bug: 10785988
Change-Id: If824d1d1876d8434958b2a5bc97d2852da118a8b
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-xxhdpi/ic_hq_disabled.png | bin | 0 -> 8857 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_hq_disabled_pressed.png | bin | 0 -> 8295 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_hq_normal.png | bin | 0 -> 6630 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_hq_normal_pressed.png | bin | 0 -> 6719 bytes | |||
-rw-r--r-- | res/values/arrays.xml | 21 | ||||
-rw-r--r-- | res/values/strings.xml | 3 | ||||
-rw-r--r-- | res/xml/camera_preferences.xml | 9 |
7 files changed, 33 insertions, 0 deletions
diff --git a/res/drawable-xxhdpi/ic_hq_disabled.png b/res/drawable-xxhdpi/ic_hq_disabled.png Binary files differnew file mode 100644 index 000000000..74d73afff --- /dev/null +++ b/res/drawable-xxhdpi/ic_hq_disabled.png diff --git a/res/drawable-xxhdpi/ic_hq_disabled_pressed.png b/res/drawable-xxhdpi/ic_hq_disabled_pressed.png Binary files differnew file mode 100644 index 000000000..fc84bd745 --- /dev/null +++ b/res/drawable-xxhdpi/ic_hq_disabled_pressed.png diff --git a/res/drawable-xxhdpi/ic_hq_normal.png b/res/drawable-xxhdpi/ic_hq_normal.png Binary files differnew file mode 100644 index 000000000..1b601ee39 --- /dev/null +++ b/res/drawable-xxhdpi/ic_hq_normal.png diff --git a/res/drawable-xxhdpi/ic_hq_normal_pressed.png b/res/drawable-xxhdpi/ic_hq_normal_pressed.png Binary files differnew file mode 100644 index 000000000..e6e83343d --- /dev/null +++ b/res/drawable-xxhdpi/ic_hq_normal_pressed.png diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 545765033..eb893d48a 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -430,6 +430,27 @@ <item>@drawable/ic_video_effects_background_normal_holo_dark</item> </array> + <string-array name="pref_camera_hq_entries" translatable="false"> + <item>@string/setting_off</item> + <item>@string/setting_on</item> + </string-array> + + <string-array name="pref_camera_hq_labels" translatable="false"> + <item>@string/pref_camera_scenemode_entry_hq</item> + <item>@string/pref_camera_scenemode_entry_hq</item> + </string-array> + + <string-array name="pref_camera_hq_icons" translatable="false"> + <item>@drawable/ic_hq_disabled</item> + <item>@drawable/ic_hq_normal</item> + </string-array> + + <string-array name="pref_camera_hq_entryvalues" translatable="false"> + <item>@string/setting_off_value</item> + <item>@string/setting_on_value</item> + </string-array> + + <string-array name="pref_camera_hdr_entries" translatable="false"> <item>@string/setting_off</item> <item>@string/setting_on</item> diff --git a/res/values/strings.xml b/res/values/strings.xml index eee320339..9639f604b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -397,6 +397,9 @@ <!-- Default HDR entry value --> <string name="pref_camera_hdr_default">@string/setting_off_value</string> + <!-- Default HQ entry value --> + <string name="pref_camera_hq_default">@string/setting_off_value</string> + <!-- HDR label ON [CHAR LIMIT=60] --> <string name="pref_camera_hdr_label">HDR</string> diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index b97840456..c745e84aa 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -88,6 +88,15 @@ camera:largeIcons="@array/pref_camera_hdr_icons" camera:labelList="@array/pref_camera_hdr_labels" camera:entryValues="@array/pref_camera_hdr_entryvalues" /> + <IconListPreference + camera:key="pref_camera_hq_key" + camera:defaultValue="@string/pref_camera_hq_default" + camera:title="@string/pref_camera_scenemode_entry_hq" + camera:entries="@array/pref_camera_hq_entries" + camera:icons="@array/pref_camera_hq_icons" + camera:largeIcons="@array/pref_camera_hq_icons" + camera:labelList="@array/pref_camera_hq_labels" + camera:entryValues="@array/pref_camera_hq_entryvalues" /> <CountDownTimerPreference camera:key="pref_camera_timer_key" camera:defaultValue="@string/pref_camera_timer_default" |