summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorkaiyiz <kaiyiz@codeaurora.org>2014-07-09 16:09:30 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2014-07-09 01:23:19 -0700
commita93bcab298619ce26a9dcb8cbb89667ebe889996 (patch)
tree749043401a350a8bf00dfb487680c492b3c575c1 /src/com/android
parent38cc61512bb6615e52bc373986edfadb039c7753 (diff)
downloadandroid_packages_apps_Snap-a93bcab298619ce26a9dcb8cbb89667ebe889996.tar.gz
android_packages_apps_Snap-a93bcab298619ce26a9dcb8cbb89667ebe889996.tar.bz2
android_packages_apps_Snap-a93bcab298619ce26a9dcb8cbb89667ebe889996.zip
Camera2: Fix show switcher after capture picture with HDR on in message
Switcher should not be shown when open camera use CAPTURE intent. Show switcher only when mIsImaegCaptureIntent not true. CRs-Fixed: 690941 Change-Id: I41c34288adfccf3cdad7b14f552f8dd67c3106c1
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/camera/PhotoModule.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index cb76c56e9..a2dab2c3b 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1060,8 +1060,7 @@ public class PhotoModule
}
if (mIsImageCaptureIntent) {
stopPreview();
- }
- if (mSceneMode == CameraUtil.SCENE_MODE_HDR) {
+ } else if (mSceneMode == CameraUtil.SCENE_MODE_HDR) {
mUI.showSwitcher();
mUI.setSwipingEnabled(true);
}