summaryrefslogtreecommitdiff
path: root/src/com/android/camera/PhotoModule.java
diff options
context:
space:
mode:
authorKerong Sui <ksui@codeaurora.org>2014-04-11 14:15:56 +0800
committerLorDClockaN <davor@losinj.com>2014-10-21 14:31:17 +0200
commit17ae2edd2cb105c0dfd0465de0729a9e8bbe5c41 (patch)
treed7e2608d2fb2dbe0d7edff2090bbbdb5536bc5a6 /src/com/android/camera/PhotoModule.java
parente366e18e8e4a38f208a3295b67d3dfe22ecbf063 (diff)
Camera2: update the flash icon when set HDR on
When HDR is on the flash mode should be set to off. And the icon should be show as off too Change-Id: I2cca985694e8a5a8058d6bf5467d5375514acfab CRs-fixed: 645595
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
-rw-r--r--src/com/android/camera/PhotoModule.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index e28e9283..8c80d5fd 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2817,6 +2817,8 @@ public class PhotoModule
} else {
mFocusManager.overrideFocusMode(mParameters.getFocusMode());
+ if (hdrOn)
+ mParameters.setFlashMode(Parameters.FLASH_MODE_OFF);
}
if (mContinuousFocusSupported && ApiHelper.HAS_AUTO_FOCUS_MOVE_CALLBACK) {