diff options
| author | weijiew <weijiew@codeaurora.org> | 2016-07-26 17:16:22 +0800 |
|---|---|---|
| committer | weijiew <weijiew@codeaurora.org> | 2016-07-27 10:55:04 +0800 |
| commit | 3fef2fdc0da2735107da5a98525cc6772b4bfaa9 (patch) | |
| tree | 1482e6f8c08f5f35576a3d07389987d08773ed97 /src/com/android/camera/PhotoMenu.java | |
| parent | 0b4a800fc0736681e19a6b2dd48174569e0451dc (diff) | |
| download | android_packages_apps_Snap-3fef2fdc0da2735107da5a98525cc6772b4bfaa9.tar.gz android_packages_apps_Snap-3fef2fdc0da2735107da5a98525cc6772b4bfaa9.tar.bz2 android_packages_apps_Snap-3fef2fdc0da2735107da5a98525cc6772b4bfaa9.zip | |
SnapdragonCamera: Fix the issue Color effect is confusion
Color effect display highlighting when scene mode set with
non auto after switch rear/front camera.Set color effect
display grey when scene mode set with non auto
Change-Id: I2837de78ba0271a6b3acd25ca02aed9a63967328
CRs-Fixed: 1042257
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 6a1f08597..f8f503efb 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -788,7 +788,11 @@ public class PhotoMenu extends MenuController || (notSame(hdrPref, CameraSettings.KEY_CAMERA_HDR, mSettingOff))) { buttonSetEnabled(mFilterModeSwitcher, false); changeFilterModeControlIcon("none"); - } else { + } else if (same(scenePref, CameraSettings.KEY_SCENE_MODE, Parameters.SCENE_MODE_AUTO) + && (same(hdrPref, CameraSettings.KEY_CAMERA_HDR, mSettingOff) + || !hdrPref.getKey().equals(CameraSettings.KEY_CAMERA_HDR))) { + //mFilterModeSwitcher can be enabled only when scene mode is set to auto + // and HDR is set to off, buttonSetEnabled(mFilterModeSwitcher, true); } } @@ -820,7 +824,6 @@ public class PhotoMenu extends MenuController .findPreference(prefKey); if (pref == null) return; - if (prefKey.equals(CameraSettings.KEY_CAMERA_ID)) { // Hide the camera control while switching the camera. // The camera control will be added back when |