summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoModule.java
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2017-01-09 11:51:34 +0100
committerZhao Wei Liew <zhaoweiliew@gmail.com>2017-01-24 09:44:52 +0000
commit48d968543f12747298abe3f199eb843dbc583cdd (patch)
tree3689a49de9de68654e1c500876fce55fdd7884ad /src/com/android/camera/PhotoModule.java
parent0e68dec285dd3ecd2d9ed69350fb487b0e62680b (diff)
downloadandroid_packages_apps_Snap-48d968543f12747298abe3f199eb843dbc583cdd.tar.gz
android_packages_apps_Snap-48d968543f12747298abe3f199eb843dbc583cdd.tar.bz2
android_packages_apps_Snap-48d968543f12747298abe3f199eb843dbc583cdd.zip
Correctly return to film strip after editing a picture.
Change-Id: Icd4e47474f871d427d10ab2575e0d9622f1b4369 (cherry picked from commit e0a3c03cf912c6b437dd2bf96f486b88c699fb9c)
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
-rw-r--r--src/com/android/camera/PhotoModule.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index e41c77762..590a11226 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2997,7 +2997,9 @@ public class PhotoModule extends BaseModule<PhotoUI> implements
new CameraManager.CameraPreviewDataCallback() {
@Override
public void onPreviewFrame(byte[] data, CameraProxy camera) {
- mUI.hidePreviewCover();
+ if (arePreviewControlsVisible()) {
+ mUI.hidePreviewCover();
+ }
}
});
mCameraDevice.startPreview();