diff options
| author | Kerong Sui <ksui@codeaurora.org> | 2014-04-11 14:15:56 +0800 |
|---|---|---|
| committer | Kerong Sui <ksui@codeaurora.org> | 2014-04-11 14:15:56 +0800 |
| commit | 4d6af65ea12d4ae6e8c82796e9eff708b0b13b74 (patch) | |
| tree | 6bd331a0d2ee0330a387bc243e7cc6246ebf1d27 /src/com/android/camera/PhotoModule.java | |
| parent | 9274e27bc38c585259b99499bd511fd9d4e1cd76 (diff) | |
| download | android_packages_apps_Snap-4d6af65ea12d4ae6e8c82796e9eff708b0b13b74.tar.gz android_packages_apps_Snap-4d6af65ea12d4ae6e8c82796e9eff708b0b13b74.tar.bz2 android_packages_apps_Snap-4d6af65ea12d4ae6e8c82796e9eff708b0b13b74.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
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index e1cd668cb..305c2bf82 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2774,6 +2774,8 @@ public class PhotoModule mParameters.setFocusMode(mFocusManager.getFocusMode()); } else { mFocusManager.overrideFocusMode(mParameters.getFocusMode()); + if (hdrOn) + mParameters.setFlashMode(Parameters.FLASH_MODE_OFF); } if (mContinuousFocusSupported && ApiHelper.HAS_AUTO_FOCUS_MOVE_CALLBACK) { |