Change icons and code from HQ to HDR+ mode.

  Bug: 11047147

Change-Id: Ib0ab1675788f6584d2b06b63a113468d2e775f23

28 files changed, 15 insertions, 15 deletions

diff --git a/res/drawable-hdpi/ic_hdr_plus_disabled.png b/res/drawable-hdpi/ic_hdr_plus_disabled.png
new file mode 100644
index 000000000..68976c242
--- /dev/null
+++ b/res/drawable-hdpi/ic_hdr_plus_disabled.png
diff --git a/res/drawable-hdpi/ic_hdr_plus_disabled_pressed.png b/res/drawable-hdpi/ic_hdr_plus_disabled_pressed.png
new file mode 100644
index 000000000..ed8d78ed2
--- /dev/null
+++ b/res/drawable-hdpi/ic_hdr_plus_disabled_pressed.png
diff --git a/res/drawable-hdpi/ic_hdr_plus_normal.png b/res/drawable-hdpi/ic_hdr_plus_normal.png
new file mode 100644
index 000000000..384b33782
--- /dev/null
+++ b/res/drawable-hdpi/ic_hdr_plus_normal.png
diff --git a/res/drawable-hdpi/ic_hdr_plus_normal_pressed.png b/res/drawable-hdpi/ic_hdr_plus_normal_pressed.png
new file mode 100644
index 000000000..2f5d238dd
--- /dev/null
+++ b/res/drawable-hdpi/ic_hdr_plus_normal_pressed.png
diff --git a/res/drawable-hdpi/ic_indicator_hdr_plus_on.png b/res/drawable-hdpi/ic_indicator_hdr_plus_on.png
new file mode 100644
index 000000000..a7d7db8bb
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicator_hdr_plus_on.png
diff --git a/res/drawable-mdpi/ic_hdr_plus_disabled.png b/res/drawable-mdpi/ic_hdr_plus_disabled.png
new file mode 100644
index 000000000..6781d647c
--- /dev/null
+++ b/res/drawable-mdpi/ic_hdr_plus_disabled.png
diff --git a/res/drawable-mdpi/ic_hdr_plus_disabled_pressed.png b/res/drawable-mdpi/ic_hdr_plus_disabled_pressed.png
new file mode 100644
index 000000000..287fdd287
--- /dev/null
+++ b/res/drawable-mdpi/ic_hdr_plus_disabled_pressed.png
diff --git a/res/drawable-mdpi/ic_hdr_plus_normal.png b/res/drawable-mdpi/ic_hdr_plus_normal.png
new file mode 100644
index 000000000..7c280e525
--- /dev/null
+++ b/res/drawable-mdpi/ic_hdr_plus_normal.png
diff --git a/res/drawable-mdpi/ic_hdr_plus_normal_pressed.png b/res/drawable-mdpi/ic_hdr_plus_normal_pressed.png
new file mode 100644
index 000000000..be498e492
--- /dev/null
+++ b/res/drawable-mdpi/ic_hdr_plus_normal_pressed.png
diff --git a/res/drawable-mdpi/ic_indicator_hdr_plus_on.png b/res/drawable-mdpi/ic_indicator_hdr_plus_on.png
new file mode 100644
index 000000000..1cf56b3f3
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicator_hdr_plus_on.png
diff --git a/res/drawable-xhdpi/ic_hdr_plus_disabled.png b/res/drawable-xhdpi/ic_hdr_plus_disabled.png
new file mode 100644
index 000000000..ff7d89c8b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_hdr_plus_disabled.png
diff --git a/res/drawable-xhdpi/ic_hdr_plus_disabled_pressed.png b/res/drawable-xhdpi/ic_hdr_plus_disabled_pressed.png
new file mode 100644
index 000000000..69676c62c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_hdr_plus_disabled_pressed.png
diff --git a/res/drawable-xhdpi/ic_hdr_plus_normal.png b/res/drawable-xhdpi/ic_hdr_plus_normal.png
new file mode 100644
index 000000000..1358e3412
--- /dev/null
+++ b/res/drawable-xhdpi/ic_hdr_plus_normal.png
diff --git a/res/drawable-xhdpi/ic_hdr_plus_normal_pressed.png b/res/drawable-xhdpi/ic_hdr_plus_normal_pressed.png
new file mode 100644
index 000000000..d1135de7d
--- /dev/null
+++ b/res/drawable-xhdpi/ic_hdr_plus_normal_pressed.png
diff --git a/res/drawable-xhdpi/ic_indicator_hdr_plus_on.png b/res/drawable-xhdpi/ic_indicator_hdr_plus_on.png
new file mode 100644
index 000000000..f6ce3d7a5
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicator_hdr_plus_on.png
diff --git a/res/drawable-xxhdpi/ic_hdr_plus_disabled.png b/res/drawable-xxhdpi/ic_hdr_plus_disabled.png
new file mode 100644
index 000000000..7fa8e9c79
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_hdr_plus_disabled.png
diff --git a/res/drawable-xxhdpi/ic_hdr_plus_disabled_pressed.png b/res/drawable-xxhdpi/ic_hdr_plus_disabled_pressed.png
new file mode 100644
index 000000000..ed7295416
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_hdr_plus_disabled_pressed.png
diff --git a/res/drawable-xxhdpi/ic_hdr_plus_normal.png b/res/drawable-xxhdpi/ic_hdr_plus_normal.png
new file mode 100644
index 000000000..7d2e0ef13
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_hdr_plus_normal.png
diff --git a/res/drawable-xxhdpi/ic_hdr_plus_normal_pressed.png b/res/drawable-xxhdpi/ic_hdr_plus_normal_pressed.png
new file mode 100644
index 000000000..558cbe876
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_hdr_plus_normal_pressed.png
diff --git a/res/drawable-xxhdpi/ic_hq_disabled.png b/res/drawable-xxhdpi/ic_hq_disabled.png
deleted file mode 100644
index 74d73afff..000000000
--- a/res/drawable-xxhdpi/ic_hq_disabled.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_hq_disabled_pressed.png b/res/drawable-xxhdpi/ic_hq_disabled_pressed.png
deleted file mode 100644
index fc84bd745..000000000
--- a/res/drawable-xxhdpi/ic_hq_disabled_pressed.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_hq_normal.png b/res/drawable-xxhdpi/ic_hq_normal.png
deleted file mode 100644
index 1b601ee39..000000000
--- a/res/drawable-xxhdpi/ic_hq_normal.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_hq_normal_pressed.png b/res/drawable-xxhdpi/ic_hq_normal_pressed.png
deleted file mode 100644
index e6e83343d..000000000
--- a/res/drawable-xxhdpi/ic_hq_normal_pressed.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_indicator_hdr_plus_on.png b/res/drawable-xxhdpi/ic_indicator_hdr_plus_on.png
new file mode 100644
index 000000000..3b567a0ad
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_indicator_hdr_plus_on.png
diff --git a/res/drawable-xxhdpi/ic_indicator_hq_on.png b/res/drawable-xxhdpi/ic_indicator_hq_on.png
deleted file mode 100644
index 71d4096c9..000000000
--- a/res/drawable-xxhdpi/ic_indicator_hq_on.png
+++ /dev/null
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 02f873b27..56d70a3eb 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -430,22 +430,22 @@
         <item>@drawable/ic_video_effects_background_normal_holo_dark</item>
     </array>
 
-    <string-array name="pref_camera_hq_entries" translatable="false">
+    <string-array name="pref_camera_hdr_plus_entries" translatable="false">
         <item>@string/setting_off</item>
         <item>@string/setting_on</item>
     </string-array>
 
-    <string-array name="pref_camera_hq_labels" translatable="false">
+    <string-array name="pref_camera_hdr_plus_labels" translatable="false">
         <item>@string/pref_camera_scenemode_entry_hdr_plus</item>
         <item>@string/pref_camera_scenemode_entry_hdr_plus</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 name="pref_camera_hdr_plus_icons" translatable="false">
+        <item>@drawable/ic_hdr_plus_disabled</item>
+        <item>@drawable/ic_hdr_plus_normal</item>
     </string-array>
 
-    <string-array name="pref_camera_hq_entryvalues" translatable="false">
+    <string-array name="pref_camera_hdr_plus_entryvalues" translatable="false">
         <item>@string/setting_off_value</item>
         <item>@string/setting_on_value</item>
     </string-array>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ee632fcb6..880da21c8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -397,8 +397,8 @@
     <!-- 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>
+    <!-- Default HDR+ entry value -->
+    <string name="pref_camera_hdr_plus_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 b15a4ccf6..975a15dea 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -89,14 +89,14 @@
             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:key="pref_camera_hdr_plus_key"
+            camera:defaultValue="@string/pref_camera_hdr_plus_default"
             camera:title="@string/pref_camera_scenemode_entry_hdr_plus"
-            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" />
+            camera:entries="@array/pref_camera_hdr_plus_entries"
+            camera:icons="@array/pref_camera_hdr_plus_icons"
+            camera:largeIcons="@array/pref_camera_hdr_plus_icons"
+            camera:labelList="@array/pref_camera_hdr_plus_labels"
+            camera:entryValues="@array/pref_camera_hdr_plus_entryvalues" />
     <CountDownTimerPreference
             camera:key="pref_camera_timer_key"
             camera:defaultValue="@string/pref_camera_timer_default"