summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKerong Sui <ksui@codeaurora.org>2014-04-11 14:15:56 +0800
committerMichael Bestas <mikeioannina@gmail.com>2014-10-20 22:41:19 +0000
commit2cec466387f6777db9c22ec53b8e24ceb3430c6c (patch)
tree8ce1e9f92543f5e9979bdeb441763ae71ed172e6
parent6f5cb2700e6df99171b9d051dae88f4e6af752f9 (diff)
downloadandroid_packages_apps_Camera2-2cec466387f6777db9c22ec53b8e24ceb3430c6c.tar.gz
android_packages_apps_Camera2-2cec466387f6777db9c22ec53b8e24ceb3430c6c.tar.bz2
android_packages_apps_Camera2-2cec466387f6777db9c22ec53b8e24ceb3430c6c.zip
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
-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 e28e92833..8c80d5fd8 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) {