From 860bd020b0414c3d52da8bcde260fbbbb20a9359 Mon Sep 17 00:00:00 2001 From: Paul Keith Date: Tue, 9 Jan 2018 01:33:00 +0100 Subject: 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 --- res/drawable/ic_settings_onex.xml | 14 -------------- res/values/qcomarrays.xml | 12 +----------- res/values/qcomstrings.xml | 14 -------------- res/xml/camera_preferences.xml | 7 ------- src/com/android/camera/CameraSettings.java | 17 ----------------- src/com/android/camera/PhotoMenu.java | 1 - src/com/android/camera/PhotoModule.java | 10 ---------- 7 files changed, 1 insertion(+), 74 deletions(-) delete mode 100644 res/drawable/ic_settings_onex.xml 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 @@ - - - - - - diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml index 37c8337f9..f01b99689 100755 --- a/res/values/qcomarrays.xml +++ b/res/values/qcomarrays.xml @@ -823,17 +823,7 @@ @string/pref_hdr_mode_value_multi_frame - - - @string/pref_camera_hdr_need_1x_entry_false - @string/pref_camera_hdr_need_1x_entry_true - - - - @string/pref_hdr_need_1x_value_false - @string/pref_hdr_need_1x_value_true - - + @string/pref_camera_tsmakeup_entry_off @string/pref_camera_tsmakeup_entry_on diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 57df98ab3..c95f19f02 100755 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -864,20 +864,6 @@ hdr-mode-sensor hdr-mode-multiframe - - @string/pref_hdr_need_1x_value_true - - - HDR need 1x frame - - - @string/setting_off - @string/setting_on - - - false - true - 0 diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index b11efbcd1..a5fc85c28 100755 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -364,13 +364,6 @@ camera:singleIcon="@drawable/ic_hdr" camera:entries="@array/pref_camera_hdr_mode_entries" camera:entryValues="@array/pref_camera_hdr_mode_entryvalues" /> - getSupportedHDRNeed1x(Parameters params) { - String str = params.get(KEY_SNAPCAM_SUPPORTED_HDR_NEED_1X); - if (str == null) { - return null; - } - return split(str); - } - public List 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, -- cgit v1.2.3