Merge "SnapdragonCamera: Force removing preview cover" into camera.lnx.1.0-dev.1.0

2 files changed, 14 insertions, 4 deletions

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 6f116ab24..028bfd1e2 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1258,13 +1258,14 @@ public class PhotoModule
         public void onPictureTaken(final byte [] jpegData, CameraProxy camera) {
             mUI.stopSelfieFlash();
             mUI.enableShutter(true);
+            if (mUI.isPreviewCoverVisible()) {
+                 // When take picture request is sent before starting preview, onPreviewFrame()
+                 // callback doesn't happen so removing preview cover here, instead.
+                 mUI.hidePreviewCover();
+            }
             if (mInstantCaptureSnapShot == true) {
                 Log.v(TAG, "Instant capture picture taken!");
                 mInstantCaptureSnapShot = false;
-
-                // When take picture request is sent before starting preview, onPreviewFrame()
-                // callback doesn't happen so removing preview cover here, instead.
-                mUI.hidePreviewCover();
             }
             if (mPaused) {
                 return;
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index 7c715d9fd..daec2df4c 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -1247,6 +1247,15 @@ public class PhotoUI implements PieListener,
         }
     }
 
+    public boolean isPreviewCoverVisible() {
+        if ((mPreviewCover != null) &&
+            (mPreviewCover.getVisibility() == View.VISIBLE)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
     public void onPause() {
         cancelCountDown();