From 3c25b23bfecf7782971141184ecf8fd1e201b4ca Mon Sep 17 00:00:00 2001 From: weijiew Date: Fri, 2 Dec 2016 12:31:43 +0800 Subject: SnapdragonCamera: Disable the flash button in ChromaFlash mode Disable the flash button in ChromaFlash mode Change-Id: I8c2b9374f91f9125bd70e81aab458938e687adbe CRs-Fixed: 1096503 --- src/com/android/camera/CaptureUI.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/com/android/camera/CaptureUI.java') diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java index e2935b9ae..5762bcbe1 100644 --- a/src/com/android/camera/CaptureUI.java +++ b/src/com/android/camera/CaptureUI.java @@ -553,6 +553,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, public void initFlashButton() { mFlashButton.init(false); + enableView(mFlashButton, SettingsManager.KEY_FLASH_MODE); } public void initSceneModeButton() { @@ -593,8 +594,10 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, private void enableView(View view, String key) { Map map = mSettingsManager.getValuesMap(); SettingsManager.Values values = map.get(key); - boolean enabled = values.overriddenValue == null; - view.setEnabled(enabled); + if ( values != null ) { + boolean enabled = values.overriddenValue == null; + view.setEnabled(enabled); + } } public void showTimeLapseUI(boolean enable) { @@ -1501,6 +1504,8 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, } showSceneModeLabel(); } + }else if(state.key.equals(SettingsManager.KEY_FLASH_MODE) ) { + enableView(mFlashButton, SettingsManager.KEY_FLASH_MODE); } } } -- cgit v1.2.3