summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorAngus Kong <shkong@google.com>2013-05-30 11:31:12 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-30 11:31:12 -0700
commit4dbf12d1a01e400ccb4d6dc1a5bbc5ca1dfa178a (patch)
tree043ca750a92180ea75256b78eb3ddc5be2d07bc0 /src/com/android
parent53c017961c78d7ed9e95ec081cf821db2ba91745 (diff)
parent66c236598a273c308384423a1d9babce05c79588 (diff)
downloadandroid_packages_apps_Gallery2-4dbf12d1a01e400ccb4d6dc1a5bbc5ca1dfa178a.tar.gz
android_packages_apps_Gallery2-4dbf12d1a01e400ccb4d6dc1a5bbc5ca1dfa178a.tar.bz2
android_packages_apps_Gallery2-4dbf12d1a01e400ccb4d6dc1a5bbc5ca1dfa178a.zip
am 66c23659: am a1db2653: Dismiss settings when showing popup in Video mode.
* commit '66c236598a273c308384423a1d9babce05c79588': Dismiss settings when showing popup in Video mode.
Diffstat (limited to 'src/com/android')
-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);
}