Snap: Rip out hdr-need-1x option

* This breaks HDR on every device that has this param, because this
  makes the camera HAL return *1* e*x*tra frame at 0 exposure, and
  since Snap doesn't know what to do with this extra frame, it
  erroneously saves it as a second picture on device storage
* Remove this option entirely to make HDR great again

Change-Id: I8ef4072eb030f4ab6e608a0da268274a3dc58e34

4 files changed, 1 insertions, 46 deletions

diff --git a/res/drawable/ic_settings_onex.xml b/res/drawable/ic_settings_onex.xml
deleted file mode 100644
index 5d5efd9b8..000000000
--- a/res/drawable/ic_settings_onex.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:pathData="M0 0h24v24H0z" />
-    <path
-        android:fillColor="@color/white"
-        android:pathData="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1 .9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm-5
-14h-2V9h-2V7h4v10z" />
-</vector>
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index 16e9c4e83..0b3d33d2a 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -781,17 +781,7 @@
         <item>@string/pref_hdr_mode_value_multi_frame</item>
     </string-array>
 
-    <!-- Camera Preferences Selectable HDR need 1x frame -->
-    <string-array name="pref_camera_hdr_need_1x_entries" translatable="false">
-        <item>@string/pref_camera_hdr_need_1x_entry_false</item>
-        <item>@string/pref_camera_hdr_need_1x_entry_true</item>
-    </string-array>
-
-    <string-array name="pref_camera_hdr_need_1x_entryvalues" translatable="false">
-        <item>@string/pref_hdr_need_1x_value_false</item>
-        <item>@string/pref_hdr_need_1x_value_true</item>
-    </string-array>
-        <string-array name="pref_camera_tsmakeup_entries">
+    <string-array name="pref_camera_tsmakeup_entries">
         <item>@string/pref_camera_tsmakeup_entry_off</item>
         <item>@string/pref_camera_tsmakeup_entry_on</item>
     </string-array>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 97ca0ded2..56463aec2 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -808,20 +808,6 @@
     <string name="pref_hdr_mode_value_sensor" translatable="false">hdr-mode-sensor</string>
     <string name="pref_hdr_mode_value_multi_frame" translatable="false">hdr-mode-multiframe</string>
 
-    <!-- Settings screen, Selectable HDR need 1x frame default value -->
-    <string name="pref_camera_hdr_need_1x_default" translatable="false">@string/pref_hdr_need_1x_value_true</string>
-
-    <!-- Settings screen, Selectable HDR need 1x frame title -->
-    <string name="pref_camera_hdr_need_1x_title">HDR needs 1x frame</string>
-
-    <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-    <string name="pref_camera_hdr_need_1x_entry_false" translatable="false">@string/setting_off</string>
-    <string name="pref_camera_hdr_need_1x_entry_true" translatable="false">@string/setting_on</string>
-
-    <!-- HDR need 1x frame entry values. Do not translate. -->
-    <string name="pref_hdr_need_1x_value_false" translatable="false">false</string>
-    <string name="pref_hdr_need_1x_value_true" translatable="false">true</string>
-
     <!--Default video rotation setting-->
     <string name="pref_camera_video_rotation_default" translatable="false">0</string>
 
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 39bc9cb1f..9508bd7b1 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -365,13 +365,6 @@
             camera:entries="@array/pref_camera_hdr_mode_entries"
             camera:entryValues="@array/pref_camera_hdr_mode_entryvalues" />
     <IconListPreference
-            camera:key="pref_camera_hdr_need_1x_key"
-            camera:defaultValue="@string/pref_camera_hdr_need_1x_default"
-            camera:title="@string/pref_camera_hdr_need_1x_title"
-            camera:singleIcon="@drawable/ic_settings_onex"
-            camera:entries="@array/pref_camera_hdr_need_1x_entries"
-            camera:entryValues="@array/pref_camera_hdr_need_1x_entryvalues" />
-    <IconListPreference
             camera:key="pref_camera_manual_exp_key"
             camera:defaultValue="@string/pref_camera_manual_exp_default"
             camera:title="@string/pref_camera_manual_exp_title"