diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-17 12:16:05 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-17 12:16:05 -0800 |
commit | bba231c5923d2aa0c9c0f6965c3037dd9805c564 (patch) | |
tree | 9288b1174883e41a6cd7f0d9520170abb9db70d6 /src/com/android/camera/ui | |
parent | aade11641bde65221479762de4afb36cbe69ee65 (diff) | |
parent | b3f0ed3b8be79c3f96f2446a463c1c522b6f695f (diff) | |
download | android_packages_apps_Snap-bba231c5923d2aa0c9c0f6965c3037dd9805c564.tar.gz android_packages_apps_Snap-bba231c5923d2aa0c9c0f6965c3037dd9805c564.tar.bz2 android_packages_apps_Snap-bba231c5923d2aa0c9c0f6965c3037dd9805c564.zip |
Merge "SnapdragonCamera: Fix does`t support HDR and chromaflash meanwhile" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/ui')
-rw-r--r-- | src/com/android/camera/ui/CameraControls.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java index b85d7f1ca..1e28080f4 100644 --- a/src/com/android/camera/ui/CameraControls.java +++ b/src/com/android/camera/ui/CameraControls.java @@ -244,8 +244,6 @@ public class CameraControls extends RotatableLayout { mFrontBackSwitcher.setEnabled(enable); if(TsMakeupManager.HAS_TS_MAKEUP) { mTsMakeupSwitcher.setEnabled(enable); - } else { - mHdrSwitcher.setEnabled(enable); } mPreview.setEnabled(enable); |