Fix some inconsistencies of the HDR button

Issues fixed:

 - The HDR button disappeared and never came back when switching
   from a camera without HDR support and one with HDR support.
 - The HDR button disappeared upon disabling HDR on a device
   without auto-HDR support.
 - The filter mode button was not re-enabled upon disabling HDR.

Change-Id: Ie7dbf91efa2d6bffc810ca79c73bb0edaa8d56ca

1 files changed, 12 insertions, 9 deletions

diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index fccea69f9..c0c87b738 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -1418,16 +1418,19 @@ public class PhotoMenu extends MenuController
         }
 
         ListPreference autoHdrPref = mPreferenceGroup.findPreference(CameraSettings.KEY_AUTO_HDR);
-        if (autoHdrPref == null) {
-            mHdrSwitcher.setVisibility(View.INVISIBLE);
-        } else if (autoHdrPref.getValue().equalsIgnoreCase("enable")) {
-            mHdrSwitcher.setVisibility(View.VISIBLE);
-            mHdrSwitcher.setEnabled(false);
-        } else {
-            mHdrSwitcher.setVisibility(View.VISIBLE);
-            mHdrSwitcher.setEnabled(true);
+        if (autoHdrPref != null) {
+            if (autoHdrPref.getValue().equalsIgnoreCase("enable")) {
+                mHdrSwitcher.setVisibility(View.VISIBLE);
+                mHdrSwitcher.setEnabled(false);
+            } else {
+                mHdrSwitcher.setVisibility(View.VISIBLE);
+                mHdrSwitcher.setEnabled(true);
+            }
         }
-        updateFilterModeIcon(pref, pref);
+
+        ListPreference hdrPref = mPreferenceGroup.findPreference(CameraSettings.KEY_CAMERA_HDR);
+        ListPreference scenePref = mPreferenceGroup.findPreference(CameraSettings.KEY_SCENE_MODE);
+        updateFilterModeIcon(scenePref, hdrPref);
 
         if (same(pref, CameraSettings.KEY_RECORD_LOCATION, "on")) {
             mActivity.requestLocationPermission();