summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorAngus Kong <shkong@google.com>2013-05-02 17:45:01 -0700
committerAngus Kong <shkong@google.com>2013-05-02 18:08:16 -0700
commitd675bceed1a817e5f5a330ea27ac1b30b7be3330 (patch)
treec3e4de781471e76e6b505fd5bf476efde718f31d /src/com/android
parent7b96023121ebeac1d7b48e573a24acfd8964e2d1 (diff)
downloadandroid_packages_apps_Snap-d675bceed1a817e5f5a330ea27ac1b30b7be3330.tar.gz
android_packages_apps_Snap-d675bceed1a817e5f5a330ea27ac1b30b7be3330.tar.bz2
android_packages_apps_Snap-d675bceed1a817e5f5a330ea27ac1b30b7be3330.zip
Don't show settings when popup is shown.
bug:8771618 Change-Id: Idec1cbacec1ae958c7295facadc6653b840dbe50
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/camera/PhotoUI.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index bc43f4763..5475b98f6 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -508,6 +508,7 @@ public class PhotoUI implements PieListener,
@Override
public void onPieOpened(int centerX, int centerY) {
+ dismissPopup(false);
mActivity.cancelActivityTouchHandling();
mActivity.setSwipingEnabled(false);
if (mFaceView != null) {