Add HQ option and use it to switch to GCam.

  Bug: 10430748
  Bug: 10785988

Change-Id: If824d1d1876d8434958b2a5bc97d2852da118a8b

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
new 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
new 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
new 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
new 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"