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

3 files changed, 0 insertions, 28 deletions

diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index dd26c79f8..210e1103d 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -122,7 +122,6 @@ public class CameraSettings {
     public static final String KEY_AE_BRACKET_HDR = "pref_camera_ae_bracket_hdr_key";
     public static final String KEY_ADVANCED_FEATURES = "pref_camera_advanced_features_key";
     public static final String KEY_HDR_MODE = "pref_camera_hdr_mode_key";
-    public static final String KEY_HDR_NEED_1X = "pref_camera_hdr_need_1x_key";
     public static final String KEY_DEVELOPER_MENU = "pref_developer_menu_key";
 
     public static final String KEY_VIDEO_SNAPSHOT_SIZE = "pref_camera_videosnapsize_key";
@@ -164,7 +163,6 @@ public class CameraSettings {
     private static final String KEY_QC_SUPPORTED_VIDEO_TNR_MODES = "video-tnr-mode-values";
     private static final String KEY_QC_SUPPORTED_FACE_DETECTION = "face-detection-values";
     private static final String KEY_SNAPCAM_SUPPORTED_HDR_MODES = "hdr-mode-values";
-    private static final String KEY_SNAPCAM_SUPPORTED_HDR_NEED_1X = "hdr-need-1x-values";
     public static final String KEY_SNAPCAM_SHUTTER_SPEED = "shutter-speed";
     public static final String KEY_SNAPCAM_SHUTTER_SPEED_MODES = "shutter-speed-values";
     public static final String KEY_QC_AE_BRACKETING = "ae-bracket-hdr";
@@ -185,7 +183,6 @@ public class CameraSettings {
     public static final String KEY_QC_TNR_MODE = "tnr-mode";
     public static final String KEY_QC_VIDEO_TNR_MODE = "video-tnr-mode";
     public static final String KEY_SNAPCAM_HDR_MODE = "hdr-mode";
-    public static final String KEY_SNAPCAM_HDR_NEED_1X = "hdr-need-1x";
     public static final String KEY_VIDEO_HSR = "video-hsr";
     public static final String KEY_QC_SEE_MORE_MODE = "see-more";
     public static final String KEY_QC_NOISE_REDUCTION_MODE = "noise-reduction-mode";
@@ -643,14 +640,6 @@ public class CameraSettings {
         return split(str);
     }
 
-    public static List<String> getSupportedHDRNeed1x(Parameters params) {
-        String str = params.get(KEY_SNAPCAM_SUPPORTED_HDR_NEED_1X);
-        if (str == null) {
-            return null;
-        }
-        return split(str);
-    }
-
     public List<String> getSupportedAdvancedFeatures(Parameters params) {
         String str = params.get(KEY_QC_SUPPORTED_AF_BRACKETING_MODES);
         str += ',' + params.get(KEY_QC_SUPPORTED_CF_MODES);
@@ -836,7 +825,6 @@ public class CameraSettings {
         ListPreference longShot = group.findPreference(KEY_LONGSHOT);
         ListPreference auto_hdr = group.findPreference(KEY_AUTO_HDR);
         ListPreference hdr_mode = group.findPreference(KEY_HDR_MODE);
-        ListPreference hdr_need_1x = group.findPreference(KEY_HDR_NEED_1X);
         ListPreference cds_mode = group.findPreference(KEY_CDS_MODE);
         ListPreference video_cds_mode = group.findPreference(KEY_VIDEO_CDS_MODE);
         ListPreference tnr_mode = group.findPreference(KEY_TNR_MODE);
@@ -876,11 +864,6 @@ public class CameraSettings {
             }
         }
 
-        if (hdr_need_1x != null) {
-            filterUnsupportedOptions(group,
-                    hdr_need_1x, getSupportedHDRNeed1x(mParameters));
-        }
-
         if (hdr_mode != null) {
             filterUnsupportedOptions(group,
                     hdr_mode, getSupportedHDRModes(mParameters));
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 1634dc89f..6637e0575 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -242,7 +242,6 @@ public class PhotoMenu extends MenuController
                 CameraSettings.KEY_DENOISE,
                 CameraSettings.KEY_AUTO_HDR,
                 CameraSettings.KEY_HDR_MODE,
-                CameraSettings.KEY_HDR_NEED_1X,
                 CameraSettings.KEY_CDS_MODE,
                 CameraSettings.KEY_TNR_MODE,
                 CameraSettings.KEY_HISTOGRAM,
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index d8d08722b..21b53c3d2 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -3643,16 +3643,6 @@ public class PhotoModule
             mParameters.set(CameraSettings.KEY_SNAPCAM_HDR_MODE, hdrMode);
         }
 
-        // Set hdr need 1x
-        String hdrNeed1x = mPreferences.getString(
-                CameraSettings.KEY_HDR_NEED_1X,
-                mActivity.getString(R.string.pref_camera_hdr_need_1x_default));
-        if (CameraUtil.isSupported(hdrNeed1x,
-                CameraSettings.getSupportedHDRNeed1x(mParameters))) {
-            Log.v(TAG, "HDR need 1x value =" + hdrNeed1x);
-            mParameters.set(CameraSettings.KEY_SNAPCAM_HDR_NEED_1X, hdrNeed1x);
-        }
-
         // Set Advanced features.
         String advancedFeature = mPreferences.getString(
                 CameraSettings.KEY_ADVANCED_FEATURES,