commit fccf83bd342a3a83dc284525488e69f25e4667c4
author Andy Huibers <andyhuibers@google.com> Wed Nov 06 14:37:26 2013 -0800
committer Andy Huibers <andyhuibers@google.com> Thu Nov 07 14:20:48 2013 -0800
tree 56b4a59923d4d3de3ed140cd8a815f2fcc8e5d68
parent 2f878d54ecbb62ef09aa2b0152dea983e598724f

hide preview cover on arrival of new preview data if hidden

Bug: 11433257
Change-Id: I7225ebf1d84bbefd2f952cfa524720a7e76e7181

src/com/android/camera/PhotoUI.java

diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index 524cd46..744802f 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -286,7 +286,6 @@
     public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
         synchronized (mSurfaceTextureLock) {
             Log.v(TAG, "SurfaceTexture ready.");
-            mPreviewCover.setVisibility(View.GONE);
             mSurfaceTexture = surface;
             mController.onPreviewUIReady();
             // Workaround for b/11168275, see b/10981460 for more details
@@ -314,7 +313,10 @@
 
     @Override
     public void onSurfaceTextureUpdated(SurfaceTexture surface) {
-        // Do nothing.
+        // Make sure preview cover is hidden if preview data is available.
+        if (mPreviewCover.getVisibility() != View.GONE) {
+            mPreviewCover.setVisibility(View.GONE);
+        }
     }
 
     public View getRootView() {

src/com/android/camera/VideoUI.java

diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index 02b2567..8b01ba4 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -718,7 +718,6 @@
     @Override
     public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
         mSurfaceTexture = surface;
-        mPreviewCover.setVisibility(View.GONE);
         mController.onPreviewUIReady();
     }
 
@@ -736,6 +735,10 @@
 
     @Override
     public void onSurfaceTextureUpdated(SurfaceTexture surface) {
+        // Make sure preview cover is hidden if preview data is available.
+        if (mPreviewCover.getVisibility() != View.GONE) {
+            mPreviewCover.setVisibility(View.GONE);
+        }
     }
 
     // SurfaceHolder callbacks

src/com/android/camera/WideAnglePanoramaUI.java

diff --git a/src/com/android/camera/WideAnglePanoramaUI.java b/src/com/android/camera/WideAnglePanoramaUI.java
index 1546958..268c82b 100644
--- a/src/com/android/camera/WideAnglePanoramaUI.java
+++ b/src/com/android/camera/WideAnglePanoramaUI.java
@@ -226,7 +226,6 @@
     @Override
     public void onSurfaceTextureAvailable(SurfaceTexture surfaceTexture, int i, int i2) {
         mSurfaceTexture = surfaceTexture;
-        mPreviewCover.setVisibility(View.GONE);
         mController.onPreviewUIReady();
     }
 
@@ -245,6 +244,10 @@
 
     @Override
     public void onSurfaceTextureUpdated(SurfaceTexture surfaceTexture) {
+        // Make sure preview cover is hidden if preview data is available.
+        if (mPreviewCover.getVisibility() != View.GONE) {
+            mPreviewCover.setVisibility(View.GONE);
+        }
     }
 
     private void hideDirectionIndicators() {