summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoModule.java
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2013-12-20 16:58:44 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2013-12-20 16:58:44 -0800
commit2d8125cc3d719a4a7307c209b2dbe46f123eeb88 (patch)
tree983ad67cda2a2e021066dff99b02c3f386b54c48 /src/com/android/camera/PhotoModule.java
parentcb3021fa895b5b7f0c6f39ba10503c20fe06ac5c (diff)
parentfb1b9d062a1a966334c6a5f00f811dfc86ebf670 (diff)
downloadandroid_packages_apps_Snap-2d8125cc3d719a4a7307c209b2dbe46f123eeb88.tar.gz
android_packages_apps_Snap-2d8125cc3d719a4a7307c209b2dbe46f123eeb88.tar.bz2
android_packages_apps_Snap-2d8125cc3d719a4a7307c209b2dbe46f123eeb88.zip
Merge "Camera: Enable module switcher on resume"
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
-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 7c92f9925..f276f8a51 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();
}