summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-07-25 21:06:10 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-07-25 21:06:10 -0700
commit700f374f96450c57c51a009ea4de7cf8c35f1d7e (patch)
tree213fa9e515c73f817ed0cae6237d2cf8cce45daf
parent008dd13c2a88e6d2ea87f15134b6e689a4b05e0d (diff)
parent05181ebecc4e6f91e99c7254088ea0fd2f8291f6 (diff)
downloadandroid_packages_apps_Snap-700f374f96450c57c51a009ea4de7cf8c35f1d7e.tar.gz
android_packages_apps_Snap-700f374f96450c57c51a009ea4de7cf8c35f1d7e.tar.bz2
android_packages_apps_Snap-700f374f96450c57c51a009ea4de7cf8c35f1d7e.zip
Merge "SnapdragonCamera: Force removing preview cover" into camera.lnx.1.0-dev.1.0
-rw-r--r--src/com/android/camera/PhotoModule.java9
-rw-r--r--src/com/android/camera/PhotoUI.java9
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();