Camera2: dismiss all popups during camera exiting

If home key is pressed when UI is showing second level popup menu,
it should dismiss all popup menu, instead of back to top level menu.

Change-Id: I4678ebf875833e577d610c0aba856da5eaade982
CRs-fixed: 622519

1 files changed, 11 insertions, 2 deletions

diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index eff302212..bc021a533 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -638,7 +638,8 @@ public class PhotoUI implements PieListener,
                 @Override
                 public void onDismiss() {
                     mPopup = null;
-                    mMenu.popupDismissed();
+                    mMenu.popupDismissed(mDismissAll);
+                    mDismissAll = false;
                     showUI();
 
                     // Switch back into fullscreen/lights-out mode after popup
@@ -658,6 +659,14 @@ public class PhotoUI implements PieListener,
         }
     }
 
+    private boolean mDismissAll = false;
+    public void dismissAllPopup() {
+        mDismissAll = true;
+        if (mPopup != null && mPopup.isShowing()) {
+            mPopup.dismiss();
+        }
+    }
+
     public void onShowSwitcherPopup() {
         if (mPieRenderer != null && mPieRenderer.showsItems()) {
             mPieRenderer.hide();
@@ -680,7 +689,7 @@ public class PhotoUI implements PieListener,
         // Remove all the popups/dialog boxes
         boolean ret = false;
         if (mPopup != null) {
-            dismissPopup();
+            dismissAllPopup();
             ret = true;
         }
         onShowSwitcherPopup();