summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/ui
diff options
context:
space:
mode:
authorjunjiez <junjiez@codeaurora.org>2017-07-26 15:19:15 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-08-03 00:22:08 -0700
commit1d5a27e190b75e3ec637e471fd01480c658371ee (patch)
tree862190b1326b97c594fbea9ea5a3f843aa140d3b /src/com/android/camera/ui
parentf04b041ac7d1da4cb7964079f48f43227ee89d04 (diff)
downloadandroid_packages_apps_Snap-1d5a27e190b75e3ec637e471fd01480c658371ee.tar.gz
android_packages_apps_Snap-1d5a27e190b75e3ec637e471fd01480c658371ee.tar.bz2
android_packages_apps_Snap-1d5a27e190b75e3ec637e471fd01480c658371ee.zip
SnapdragonCamera:Disalbe options in RTB
Disable some options in the setting when it's in real time bokeh mode and modify the style of seekbar and bokeh text. Change-Id: If6f2fe40c3a405ac8a4451029d18e38d93305ef5
Diffstat (limited to 'src/com/android/camera/ui')
-rwxr-xr-xsrc/com/android/camera/ui/CameraControls.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java
index 73afcd5a0..e98ef7dd5 100755
--- a/src/com/android/camera/ui/CameraControls.java
+++ b/src/com/android/camera/ui/CameraControls.java
@@ -256,7 +256,7 @@ public class CameraControls extends RotatableLayout {
if(TsMakeupManager.HAS_TS_MAKEUP) {
mTsMakeupSwitcher.setEnabled(enable);
} else {
- mHdrSwitcher.setEnabled(enable);
+ mHdrSwitcher.setEnabled(enable && !mIsBokehMode);
}
if (mIsBokehMode) {
mBokehSwitcher.setEnabled(enable);