From 4d6af65ea12d4ae6e8c82796e9eff708b0b13b74 Mon Sep 17 00:00:00 2001
From: Kerong Sui <ksui@codeaurora.org>
Date: Fri, 11 Apr 2014 14:15:56 +0800
Subject: 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
---
 src/com/android/camera/PhotoModule.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/com/android')

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) {
-- 
cgit v1.2.3