summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2013-06-11 18:24:01 -0700
committerDoris Liu <tianliu@google.com>2013-06-12 13:18:02 -0700
commitea80b2dc89d4c090c6d5252e6ed8b1802c948958 (patch)
tree3f71723bafc8de9ed0ff1f00a44cf2d99291d5d3
parent13c3b46032990be905c885f38b9590ab19bd9398 (diff)
downloadandroid_packages_apps_Gallery2-ea80b2dc89d4c090c6d5252e6ed8b1802c948958.tar.gz
android_packages_apps_Gallery2-ea80b2dc89d4c090c6d5252e6ed8b1802c948958.tar.bz2
android_packages_apps_Gallery2-ea80b2dc89d4c090c6d5252e6ed8b1802c948958.zip
In carlesbad, fix image capture on S4
Bug: 9390020 Change-Id: I9d7e0609c55f47a267aff8499dcd244dfb2fdb3a
-rw-r--r--src/com/android/camera/NewPhotoModule.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/camera/NewPhotoModule.java b/src/com/android/camera/NewPhotoModule.java
index cd3281476..4796359ce 100644
--- a/src/com/android/camera/NewPhotoModule.java
+++ b/src/com/android/camera/NewPhotoModule.java
@@ -754,6 +754,10 @@ public class NewPhotoModule
if (mPaused) {
return;
}
+ //TODO: We should show the picture taken rather than frozen preview here
+ if (mIsImageCaptureIntent) {
+ stopPreview();
+ }
if (mSceneMode == Util.SCENE_MODE_HDR) {
mUI.showSwitcher();
mUI.setSwipingEnabled(true);