Camera2: Still popup tips when change scene to other after turn off HDR

The toast popup or not depend on the value of hdr and scene mode,
but now the value mHdrOn status is not uniform with the actual hdr
value, which lead to popup toast incorrect.

Get the value of scene mode or hdr from the preference directly rather
than a new variable. So the mHdrOn is not used and delete it.

CRs-Fixed: 674521

Change-Id: I1c6926e0ba295e9869109b7412a7413323d3bd1c

1 files changed, 12 insertions, 10 deletions

diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 82972d1a4..19bc92c8b 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -54,7 +54,6 @@ 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);
@@ -353,26 +352,29 @@ public class PhotoMenu extends PieController
         // set to non-auto. Also disable beautify when HDR is active.
         // Disable burst mode if it causes damage or doesn't make sense.
         if (notSame(pref, CameraSettings.KEY_CAMERA_HDR, mSettingOff)) {
+            ListPreference scenePref =
+                    mPreferenceGroup.findPreference(CameraSettings.KEY_SCENE_MODE);
+            if (scenePref != null && notSame(scenePref, CameraSettings.KEY_SCENE_MODE,
+                    Parameters.SCENE_MODE_AUTO)) {
+                Toast.makeText(mActivity, R.string.hdr_enable_message, Toast.LENGTH_LONG).show();
+            }
             setPreference(CameraSettings.KEY_SCENE_MODE, Parameters.SCENE_MODE_AUTO);
             setPreference(CameraSettings.KEY_BEAUTY_MODE, mSettingOff);
             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);
             }
+            ListPreference hdrPref =
+                    mPreferenceGroup.findPreference(CameraSettings.KEY_CAMERA_HDR);
+            if (hdrPref != null && notSame(hdrPref, CameraSettings.KEY_CAMERA_HDR, mSettingOff)) {
+                Toast.makeText(mActivity, R.string.scene_enable_message, Toast.LENGTH_LONG).show();
+            }
+            setPreference(CameraSettings.KEY_CAMERA_HDR, mSettingOff);
         } else if (notSame(pref, CameraSettings.KEY_BEAUTY_MODE, mSettingOff)) {
             setPreference(CameraSettings.KEY_CAMERA_HDR, mSettingOff);
             setPreference(CameraSettings.KEY_SLOW_SHUTTER, "0");