Merge "Hide switcher earlier in HDR mode" into gb-ub-photos-arches

AOKP · Oct 29, 2012 · 9198b90 · 9198b90
2 parents 6dde685 + 398aea1
commit 9198b90
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
@@ -1279,7 +1279,6 @@ public boolean capture() {
 
         if (animateBefore) {
             animateFlash();
-            mActivity.hideSwitcher();
         }
 
         // Set rotation and gps data.
@@ -1593,6 +1592,9 @@ public void onShutterButtonFocus(boolean pressed) {
         if (pressed && !canTakePicture()) return;
 
         if (pressed) {
+            if (mSceneMode == Util.SCENE_MODE_HDR) {
+                mActivity.hideSwitcher();
+            }
             mFocusManager.onShutterDown();
         } else {
             mFocusManager.onShutterUp();