Camera: Disable HDR when scene mode is other than auto

- HDR option is enabled even when scene mode is not auto.
  Due to this preview and snapshot are still remain in previous
  scene mode after enabling HDR.

- Fix is to disable the HDR when scene mode is other than auto.

Change-Id: Icec96816a7ed6f3daacc8b79841dee5db6b4b04a
CRs-Fixed: 648847

3 files changed, 19 insertions, 0 deletions

diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 9f070578e..b61bd7530 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -92,6 +92,10 @@
     <string name="pref_camera_selectablezoneaf_entry_centerweighted">Center weighted</string>
     <string name="pref_camera_selectablezoneaf_entry_frameaverage">Frame average</string>
 
+    <!-- The message is shown in toast when HDR or scene mode is enabled -->
+    <string name="hdr_enable_message">HDR is enabled, only Auto scene mode is supported</string>
+    <string name="scene_enable_message">HDR is not supported in the scene mode other than Auto</string>
+
     <!-- Settings screen, setting title text for Video HDR-->
     <string name="pref_camera_video_hdr_title">Video HDR</string>
     <string name="pref_camera_video_hdr_default" translatable="false">off</string>
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 36b032e9d..82972d1a4 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -21,6 +21,7 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.hardware.Camera.Parameters;
 import android.view.LayoutInflater;
+import android.widget.Toast;
 
 import com.android.camera.ui.AbstractSettingPopup;
 import com.android.camera.ui.CountdownTimerPopup;
@@ -53,6 +54,7 @@ public class PhotoMenu extends PieController
     private int mPopupStatus;
 
     private CameraActivity mActivity;
+    private boolean mHdrOn = false;
 
     public PhotoMenu(CameraActivity activity, PhotoUI ui, PieRenderer pie) {
         super(activity, pie);
@@ -356,10 +358,18 @@ public class PhotoMenu extends PieController
             setPreference(CameraSettings.KEY_SLOW_SHUTTER, "0");
             setPreference(CameraSettings.KEY_ASD, mSettingOff);
             disableBurstMode();
+            Toast.makeText(mActivity, R.string.hdr_enable_message,
+                            Toast.LENGTH_LONG).show();
+            mHdrOn = true;
         } else if (notSame(pref, CameraSettings.KEY_SCENE_MODE, Parameters.SCENE_MODE_AUTO) ||
                    notSame(pref, CameraSettings.KEY_ASD, mSettingOff)) {
             setPreference(CameraSettings.KEY_CAMERA_HDR, mSettingOff);
             setPreference(CameraSettings.KEY_SLOW_SHUTTER, "0");
+            if (mHdrOn) {
+                Toast.makeText(mActivity, R.string.scene_enable_message,
+                            Toast.LENGTH_LONG).show();
+            }
+            mHdrOn = false;
             if (!notSame(pref, CameraSettings.KEY_ASD, mSettingOff)) {
                 setPreference(CameraSettings.KEY_ASD, mSettingOff);
             }
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 75e17a351..54cdc275a 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2718,6 +2718,11 @@ public class PhotoModule
         } else {
             if (hdrOn) {
                 mSceneMode = CameraUtil.SCENE_MODE_HDR;
+                if (!(Parameters.SCENE_MODE_AUTO).equals(mParameters.getSceneMode())) {
+                    mParameters.setSceneMode(Parameters.SCENE_MODE_AUTO);
+                    mCameraDevice.setParameters(mParameters);
+                    mParameters = mCameraDevice.getParameters();
+                }
             } else if (asdOn) {
                 mSceneMode = CameraUtil.SCENE_MODE_ASD;
             } else {