commit 7b265a6b2f55c6ae7afc30e63ba324c4084a5d8e
author ztenghui <ztenghui@google.com> Mon Sep 09 14:58:44 2013 -0700
committer ztenghui <ztenghui@google.com> Wed Sep 11 17:12:24 2013 -0700
tree 8c70ed32155287e4f023af0df1af439688188eed
parent 20703f72e087a01e6a589c2875819cf817581a51

Fix the flash mode transition in video mode

onSwitchMode is wrongly overloaded, now is fixed.
Basically, onCurrentDataChanged will handle the switching in and out of Camera.
onDataFullScreenChange will handle full screen change on non-preview data.

bug:10610967

Change-Id: I199a20d40d66b78302e90e0f96826d03076b0e39

src/com/android/camera/VideoUI.java

diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index 88a7b58..204195f 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -612,20 +612,20 @@
         }
     }
 
-    public void onSwitchMode(boolean toCamera) {
-        if (toCamera) {
+    public void onPreviewFocusChanged(boolean previewFocused) {
+        if (previewFocused) {
             showUI();
         } else {
             hideUI();
         }
         if (mGestures != null) {
-            mGestures.setEnabled(toCamera);
+            mGestures.setEnabled(previewFocused);
         }
         if (mRenderOverlay != null) {
             // this can not happen in capture mode
-            mRenderOverlay.setVisibility(toCamera ? View.VISIBLE : View.GONE);
+            mRenderOverlay.setVisibility(previewFocused ? View.VISIBLE : View.GONE);
         }
-        setShowMenu(toCamera);
+        setShowMenu(previewFocused);
     }
 
     public void initializePopup(PreferenceGroup pref) {
@@ -672,6 +672,7 @@
         return mTextureView.getVisibility() == View.VISIBLE;
     }
 
+    @Override
     public void onDisplayChanged() {
         mCameraControls.checkLayoutFlip();
         mController.updateCameraOrientation();