diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-04-21 05:16:46 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-04-21 05:16:46 -0700 |
| commit | 7b74badd0f2b2ab34f1166d69615d4953551b387 (patch) | |
| tree | 7815decb588cbf763cc4241d3c0c7cf9439c3e97 | |
| parent | 73fe19cce94c5f0dd4cb4fbcdd26b387e8948b3c (diff) | |
| parent | d3eda87dfe008f87f8be8a2b7f1948b6f0f02cc8 (diff) | |
| download | android_packages_apps_Snap-7b74badd0f2b2ab34f1166d69615d4953551b387.tar.gz android_packages_apps_Snap-7b74badd0f2b2ab34f1166d69615d4953551b387.tar.bz2 android_packages_apps_Snap-7b74badd0f2b2ab34f1166d69615d4953551b387.zip | |
Merge "Camera2: dismiss all popups during camera exiting"
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 4 | ||||
| -rw-r--r-- | src/com/android/camera/PhotoUI.java | 13 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 1d8f49202..dfe8bd5d3 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -326,8 +326,8 @@ public class PhotoMenu extends PieController } } - public void popupDismissed() { - if (mPopupStatus == POPUP_SECOND_LEVEL) { + public void popupDismissed(boolean dismissAll) { + if (!dismissAll && mPopupStatus == POPUP_SECOND_LEVEL) { initializePopup(); mPopupStatus = POPUP_FIRST_LEVEL; if (popupNum == 1) 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(); |