Merge "Camera2: Enable HDR for zsl mode"

3 files changed, 1 insertions, 35 deletions

diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index c63f30b6f..52484f716 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -208,9 +208,6 @@
         in zsl mode
     </string>
 
-    <string name="error_app_unsupported_hdr_zsl">HDR is not supported in zsl
-        mode</string>
-
      <!-- Settings screen, AE bracketing and HDR location dialog choices -->
      <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">AE-Bracket</string>
 
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index f04500a9f..cdef2fa53 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -318,13 +318,9 @@ public class PhotoMenu extends PieController
         // set to non-auto.
         if (notSame(pref, CameraSettings.KEY_CAMERA_HDR, mSettingOff)) {
             setPreference(CameraSettings.KEY_SCENE_MODE, Parameters.SCENE_MODE_AUTO);
-            setPreference(CameraSettings.KEY_ZSL,mSettingOff);
         } else if (notSame(pref, CameraSettings.KEY_SCENE_MODE, Parameters.SCENE_MODE_AUTO)) {
             setPreference(CameraSettings.KEY_CAMERA_HDR, mSettingOff);
         }
-        if (notSame(pref,CameraSettings.KEY_ZSL,mSettingOff)){
-            setPreference(CameraSettings.KEY_CAMERA_HDR, mSettingOff);
-        }
         super.onSettingChanged(pref);
     }
 
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index c7a56c022..87345413c 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -623,7 +623,6 @@ public class PhotoModule
                     mActivity.getString(R.string.setting_off_value));
         }
         updateSceneMode();
-        updateHdrMode();
         showTapToFocusToastIfNeeded();
 
 
@@ -1348,17 +1347,6 @@ public class PhotoModule
         }
     }
 
-    private void updateHdrMode() {
-        String zsl = mPreferences.getString(CameraSettings.KEY_ZSL,
-                         mActivity.getString(R.string.pref_camera_zsl_default));
-        if (zsl.equals("on")) {
-            mUI.overrideSettings(CameraSettings.KEY_CAMERA_HDR,
-                                      mParameters.getAEBracket());
-        } else {
-            mUI.overrideSettings(CameraSettings.KEY_CAMERA_HDR, null);
-        }
-    }
-
     private void updateSceneMode() {
         // If scene mode is set, we cannot set flash mode, white balance, and
         // focus mode, instead, we read it from driver
@@ -2340,8 +2328,6 @@ public class PhotoModule
 
         String zsl = mPreferences.getString(CameraSettings.KEY_ZSL,
                                   mActivity.getString(R.string.pref_camera_zsl_default));
-        String hdr = mPreferences.getString(CameraSettings.KEY_CAMERA_HDR,
-                mActivity.getString(R.string.pref_camera_hdr_default));
         mParameters.setZSLMode(zsl);
         if(zsl.equals("on")) {
             //Switch on ZSL Camera mode
@@ -2349,11 +2335,8 @@ public class PhotoModule
             mParameters.setCameraMode(1);
             mFocusManager.setZslEnable(true);
 
-            // Currently HDR is not supported under ZSL mode
-            Editor editor = mPreferences.edit();
-            editor.putString(CameraSettings.KEY_AE_BRACKET_HDR, mActivity.getString(R.string.setting_off_value));
-
             //Raw picture format is not supported under ZSL mode
+            Editor editor = mPreferences.edit();
             editor.putString(CameraSettings.KEY_PICTURE_FORMAT, mActivity.getString(R.string.pref_camera_picture_format_value_jpeg));
             editor.apply();
 
@@ -2378,15 +2361,6 @@ public class PhotoModule
                          }
                     });
             }
-
-            if(hdr.equals(mActivity.getString(R.string.setting_on_value))) {
-                     mActivity.runOnUiThread(new Runnable() {
-                     public void run() {
-                Toast.makeText(mActivity, R.string.error_app_unsupported_hdr_zsl,
-                    Toast.LENGTH_SHORT).show();
-                         }
-                    });
-            }
         } else if(zsl.equals("off")) {
             mSnapshotMode = CameraInfo.CAMERA_SUPPORT_MODE_NONZSL;
             mParameters.setCameraMode(0);
@@ -2733,7 +2707,6 @@ public class PhotoModule
             }
             mRestartPreview = false;
             updateSceneMode();
-            updateHdrMode();
             mUpdateSet = 0;
         } else {
             if (!mHandler.hasMessages(SET_CAMERA_PARAMETERS_WHEN_IDLE)) {