diff options
| author | Camera Software Integration <camswint@localhost> | 2016-12-01 09:16:58 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-01 09:16:58 -0800 |
| commit | c3c64d3854db79181a07feead8f5ef0d53717752 (patch) | |
| tree | 5845d94f117fe469fc5d1f15b6f4969e76fd0b0e | |
| parent | cf13881fbaf0fbb45611295cbd19f1258b359bfb (diff) | |
| parent | cfd4e26c33d91bd537bbfe87bc8e85184b23d611 (diff) | |
| download | android_packages_apps_Snap-c3c64d3854db79181a07feead8f5ef0d53717752.tar.gz android_packages_apps_Snap-c3c64d3854db79181a07feead8f5ef0d53717752.tar.bz2 android_packages_apps_Snap-c3c64d3854db79181a07feead8f5ef0d53717752.zip | |
Merge "SnapdragonCamera: Scene mode button was enabled when chroma flash was on" into camera.lnx.1.0-dev.1.0
| -rw-r--r-- | src/com/android/camera/ui/CameraControls.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java index 9039a9dce..b85d7f1ca 100644 --- a/src/com/android/camera/ui/CameraControls.java +++ b/src/com/android/camera/ui/CameraControls.java @@ -247,7 +247,6 @@ public class CameraControls extends RotatableLayout { } else { mHdrSwitcher.setEnabled(enable); } - mSceneModeSwitcher.setEnabled(enable); mPreview.setEnabled(enable); } |