From d675bceed1a817e5f5a330ea27ac1b30b7be3330 Mon Sep 17 00:00:00 2001
From: Angus Kong <shkong@google.com>
Date: Thu, 2 May 2013 17:45:01 -0700
Subject: Don't show settings when popup is shown.

bug:8771618
Change-Id: Idec1cbacec1ae958c7295facadc6653b840dbe50
---
 src/com/android/camera/PhotoUI.java | 1 +
 1 file changed, 1 insertion(+)

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) {
-- 
cgit v1.2.3