diff options
| author | Doris Liu <tianliu@google.com> | 2013-06-12 20:40:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-06-12 20:40:18 +0000 |
| commit | b22e24cc4a4b65ebd88ff865ec23d592fbd645ea (patch) | |
| tree | aa52feee7a26cbb73674cd10e79c3b2cb8f71efc | |
| parent | 8b0498d0cfed3e4cd5aa874760c222826bff64c6 (diff) | |
| parent | b81204ad0ccd2f16805b0fd5277be73fc6e8d31f (diff) | |
| download | android_packages_apps_Snap-b22e24cc4a4b65ebd88ff865ec23d592fbd645ea.tar.gz android_packages_apps_Snap-b22e24cc4a4b65ebd88ff865ec23d592fbd645ea.tar.bz2 android_packages_apps_Snap-b22e24cc4a4b65ebd88ff865ec23d592fbd645ea.zip | |
Merge "In carlesbad, fix image capture on S4" into gb-ub-photos-carlsbad
| -rw-r--r-- | src/com/android/camera/NewPhotoModule.java | 4 |
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); |