commit 783fe31b1d6ed43c3c2ed24db2ecd78c14578ddf
author I-Jong Lin <ijonglin@google.com> Mon Oct 20 20:47:50 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 20 20:47:51 2014 +0000
tree f20652213b730e149775452d48506472beddb58f
parent ea77c6b2f9a602712c19ed0f441c6439b2f168de
parent 0784a835e917e1dab7bb963cb9a9b92b506fba94

Merge "Button fix for torch when no flash available in hw" into ub-camera-glacier

src/com/android/camera/app/CameraAppUI.java

diff --git a/src/com/android/camera/app/CameraAppUI.java b/src/com/android/camera/app/CameraAppUI.java
index ac77af7..2362e69 100644
--- a/src/com/android/camera/app/CameraAppUI.java
+++ b/src/com/android/camera/app/CameraAppUI.java
@@ -1875,7 +1875,9 @@
         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 @@
                     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);
             }
         }