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: I6f75f3c686d79757c464deaeca495de767bdabb0
CRs-Fixed: 648847

1 files changed, 10 insertions, 0 deletions

diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index dfe8bd5d3..e62285b56 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -31,6 +31,7 @@ import com.android.camera.ui.PieRenderer;
 import com.android.camera2.R;
 import android.content.Context;
 import android.view.LayoutInflater;
+import android.widget.Toast;
 import android.util.Log;
 
 import java.util.Locale;
@@ -59,6 +60,7 @@ public class PhotoMenu extends PieController
     private int popupNum = 0;
     private PieItem mHdrItem = null;
     private PieItem mHdrPlusItem = null;
+    private boolean mHdrOn = false;
 
     public PhotoMenu(CameraActivity activity, PhotoUI ui, PieRenderer pie) {
         super(activity, pie);
@@ -382,8 +384,16 @@ 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);
+            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)) {
             setPreference(CameraSettings.KEY_CAMERA_HDR, mSettingOff);
+            if (mHdrOn) {
+                Toast.makeText(mActivity, R.string.scene_enable_message,
+                            Toast.LENGTH_LONG).show();
+            }
+            mHdrOn = false;
         }
         super.onSettingChanged(pref);
     }