diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-07-21 04:17:17 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-07-21 04:17:17 -0700 |
| commit | ac7b4628d39b41d716bd8c4391db9deedef2ea3f (patch) | |
| tree | 5c4c2956f2213dbb2ca370a99f60dac68c76c443 /src/com/android | |
| parent | 5f79491eeff6b70dc6af076aaef13fc241dae00c (diff) | |
| parent | a93bcab298619ce26a9dcb8cbb89667ebe889996 (diff) | |
| download | android_packages_apps_Snap-ac7b4628d39b41d716bd8c4391db9deedef2ea3f.tar.gz android_packages_apps_Snap-ac7b4628d39b41d716bd8c4391db9deedef2ea3f.tar.bz2 android_packages_apps_Snap-ac7b4628d39b41d716bd8c4391db9deedef2ea3f.zip | |
Merge "Camera2: Fix show switcher after capture picture with HDR on in message"
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 31e5c87e7..c10df2477 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); } |