summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuman Mukherjee <sumam@codeaurora.org>2013-12-17 09:42:53 +0530
committerSuman Mukherjee <sumam@codeaurora.org>2013-12-17 10:22:02 +0530
commitfb1b9d062a1a966334c6a5f00f811dfc86ebf670 (patch)
treedff92ff9a02ed866619178428c6ab9b011977c4b
parent8f2f71efa7ed4e8f8f7a82bcf10c3b70341f918c (diff)
downloadandroid_packages_apps_Snap-fb1b9d062a1a966334c6a5f00f811dfc86ebf670.tar.gz
android_packages_apps_Snap-fb1b9d062a1a966334c6a5f00f811dfc86ebf670.tar.bz2
android_packages_apps_Snap-fb1b9d062a1a966334c6a5f00f811dfc86ebf670.zip
Camera: Enable module switcher on resume
For HDR mode, on pressing shutter key, module switcher icon will be turned off. That'll not be activated if user relaunch camera after pressing home key in HDR mode while capturing image. Enable switcher in UI on resuming camera module. Change-Id: I094f4941f87149e4c5b2393881ed5175c4388559 CRs-fixed: 580450
-rw-r--r--src/com/android/camera/PhotoModule.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 65b9f8242..7dd72a93e 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -724,6 +724,9 @@ public class PhotoModule
s.setListener(this);
}
mNamedImages = new NamedImages();
+ if (!mIsImageCaptureIntent) {
+ mUI.showSwitcher();
+ }
mUI.initializeSecondTime(mParameters);
keepMediaProviderInstance();
}