diff options
| author | I-Jong Lin <ijonglin@google.com> | 2014-10-20 20:47:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-20 20:47:51 +0000 |
| commit | 783fe31b1d6ed43c3c2ed24db2ecd78c14578ddf (patch) | |
| tree | f20652213b730e149775452d48506472beddb58f /src | |
| parent | ea77c6b2f9a602712c19ed0f441c6439b2f168de (diff) | |
| parent | 0784a835e917e1dab7bb963cb9a9b92b506fba94 (diff) | |
| download | android_packages_apps_Camera2-783fe31b1d6ed43c3c2ed24db2ecd78c14578ddf.tar.gz android_packages_apps_Camera2-783fe31b1d6ed43c3c2ed24db2ecd78c14578ddf.tar.bz2 android_packages_apps_Camera2-783fe31b1d6ed43c3c2ed24db2ecd78c14578ddf.zip | |
Merge "Button fix for torch when no flash available in hw" into ub-camera-glacier
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/app/CameraAppUI.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/camera/app/CameraAppUI.java b/src/com/android/camera/app/CameraAppUI.java index ac77af781..2362e6989 100644 --- a/src/com/android/camera/app/CameraAppUI.java +++ b/src/com/android/camera/app/CameraAppUI.java @@ -1875,7 +1875,9 @@ public class CameraAppUI implements ModeListView.ModeSwitchListener, boolean flashBackCamera = mController.getSettingsManager().getBoolean( SettingsManager.SCOPE_GLOBAL, Keys.KEY_FLASH_SUPPORTED_BACK_CAMERA); if (bottomBarSpec.hideFlash || !flashBackCamera) { + // Hide both flash and torch button in flash disable logic buttonManager.hideButton(ButtonManager.BUTTON_FLASH); + buttonManager.hideButton(ButtonManager.BUTTON_TORCH); } else { if (hardwareSpec.isFlashSupported()) { if (bottomBarSpec.enableFlash) { @@ -1888,11 +1890,15 @@ public class CameraAppUI implements ModeListView.ModeSwitchListener, buttonManager.initializeButton(ButtonManager.BUTTON_HDR_PLUS_FLASH, bottomBarSpec.flashCallback); } else { + // Hide both flash and torch button in flash disable logic buttonManager.disableButton(ButtonManager.BUTTON_FLASH); + buttonManager.disableButton(ButtonManager.BUTTON_TORCH); } } else { - // Disable flash icon if not supported by the hardware. + // Disable both flash and torch icon if not supported + // by the chosen camera hardware. buttonManager.disableButton(ButtonManager.BUTTON_FLASH); + buttonManager.disableButton(ButtonManager.BUTTON_TORCH); } } |