summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera
diff options
context:
space:
mode:
authorAngus Kong <shkong@google.com>2013-05-30 11:27:34 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-30 11:27:34 -0700
commit32d50e89e7877a2b38573d20a8251850c87e7851 (patch)
tree039aa603af6a5e96fd3d9ab48229633f524806cf /src/com/android/camera
parent9cbfe8d5ea68308ece1e57b4b8e38bf5f0344951 (diff)
parent91fffb39cf1eb7919cab48c56eb1b44727f4e5c2 (diff)
downloadandroid_packages_apps_Snap-32d50e89e7877a2b38573d20a8251850c87e7851.tar.gz
android_packages_apps_Snap-32d50e89e7877a2b38573d20a8251850c87e7851.tar.bz2
android_packages_apps_Snap-32d50e89e7877a2b38573d20a8251850c87e7851.zip
am a1db2653: Dismiss settings when showing popup in Video mode.
* commit 'a1db26536913f1259ad74c5e6e952521c05bf2f0': Dismiss settings when showing popup in Video mode.
Diffstat (limited to 'src/com/android/camera')
-rw-r--r--src/com/android/camera/VideoUI.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index dc23ec814..9fc05769f 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -345,6 +345,7 @@ public class VideoUI implements SurfaceHolder.Callback, PieRenderer.PieListener,
// PieListener
@Override
public void onPieOpened(int centerX, int centerY) {
+ dismissPopup(false, true);
mActivity.cancelActivityTouchHandling();
mActivity.setSwipingEnabled(false);
}