diff options
| author | weijiew <weijiew@codeaurora.org> | 2016-12-02 12:31:43 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-05 22:36:50 -0800 |
| commit | 3c25b23bfecf7782971141184ecf8fd1e201b4ca (patch) | |
| tree | eaba1d0b18ef942652424ad8f47ad062acdf8fe5 /src | |
| parent | b39e01c54b0d46b8a005e48e88537bc875b4977b (diff) | |
| download | android_packages_apps_Snap-3c25b23bfecf7782971141184ecf8fd1e201b4ca.tar.gz android_packages_apps_Snap-3c25b23bfecf7782971141184ecf8fd1e201b4ca.tar.bz2 android_packages_apps_Snap-3c25b23bfecf7782971141184ecf8fd1e201b4ca.zip | |
SnapdragonCamera: Disable the flash button in ChromaFlash mode
Disable the flash button in ChromaFlash mode
Change-Id: I8c2b9374f91f9125bd70e81aab458938e687adbe
CRs-Fixed: 1096503
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/CaptureUI.java | 9 |
1 files changed, 7 insertions, 2 deletions
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<String, SettingsManager.Values> 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); } } } |