summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2013-10-15 19:58:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-15 19:58:43 +0000
commit08749a4ed22c5001aa476a9a30df323b00a6df7d (patch)
treef476dcb288155f7aa9ae633263a2aeaa4ad4efce /src
parentd3e75bd748ce2be8fdcb30575bbde9bd07536bd3 (diff)
parentb7e90f88c7aa1fb5ce35b17ef98a255c06e8d613 (diff)
downloadandroid_packages_apps_Snap-08749a4ed22c5001aa476a9a30df323b00a6df7d.tar.gz
android_packages_apps_Snap-08749a4ed22c5001aa476a9a30df323b00a6df7d.tar.bz2
android_packages_apps_Snap-08749a4ed22c5001aa476a9a30df323b00a6df7d.zip
Merge "Dismiss switcher popup when shutter button is clicked" into gb-ub-photos-carlsbad
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/PhotoUI.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index 58df43657..aa8685379 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -610,6 +610,9 @@ public class PhotoUI implements PieListener,
}
public boolean collapseCameraControls() {
+ // TODO: Mode switcher should behave like a popup and should hide itself when there
+ // is a touch outside of it.
+ mSwitcher.closePopup();
// Remove all the popups/dialog boxes
boolean ret = false;
if (mPopup != null) {