diff options
author | Michael Kolb <kolby@google.com> | 2013-05-08 11:14:35 -0700 |
---|---|---|
committer | Michael Kolb <kolby@google.com> | 2013-05-08 14:17:25 -0700 |
commit | 7048972374474dfca142856583833d8168d3b1b6 (patch) | |
tree | 2bede13e277042c4b1d667feff8af8b93a501c79 /src/com/android/camera/PhotoUI.java | |
parent | 0815098550dd4158386d059b04de7f13fb415620 (diff) | |
download | android_packages_apps_Snap-7048972374474dfca142856583833d8168d3b1b6.tar.gz android_packages_apps_Snap-7048972374474dfca142856583833d8168d3b1b6.tar.bz2 android_packages_apps_Snap-7048972374474dfca142856583833d8168d3b1b6.zip |
Fix second level menu
Bug: 8857098
Added Countdown timer and picture size items
Change-Id: I73f3a5b22ab708e216729ed77fbd60041d40147d
Diffstat (limited to 'src/com/android/camera/PhotoUI.java')
-rw-r--r-- | src/com/android/camera/PhotoUI.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index 5475b98f6..5a7b5bfef 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -357,7 +357,7 @@ public class PhotoUI implements PieListener, mFaceView.setBlockDraw(!full); } if (mPopup != null) { - dismissPopup(false, full); + dismissPopup(full); } if (mGestures != null) { mGestures.setEnabled(full); @@ -389,7 +389,7 @@ public class PhotoUI implements PieListener, public boolean removeTopLevelPopup() { // Remove the top level popup or dialog box and return true if there's any if (mPopup != null) { - dismissPopup(true); + dismissPopup(); return true; } return false; @@ -408,11 +408,11 @@ public class PhotoUI implements PieListener, mGestures.addTouchReceiver(mPopup); } - public void dismissPopup(boolean topPopupOnly) { - dismissPopup(topPopupOnly, true); + public void dismissPopup() { + dismissPopup(true); } - private void dismissPopup(boolean topOnly, boolean fullScreen) { + private void dismissPopup(boolean fullScreen) { if (fullScreen) { mActivity.showUI(); mBlocker.setVisibility(View.VISIBLE); @@ -423,7 +423,7 @@ public class PhotoUI implements PieListener, ((FrameLayout) mRootView).removeView(mPopup); mPopup = null; } - mMenu.popupDismissed(topOnly); + mMenu.popupDismissed(); } public void onShowSwitcherPopup() { @@ -445,7 +445,7 @@ public class PhotoUI implements PieListener, // Remove all the popups/dialog boxes boolean ret = false; if (mPopup != null) { - dismissPopup(false); + dismissPopup(); ret = true; } return ret; @@ -508,7 +508,7 @@ public class PhotoUI implements PieListener, @Override public void onPieOpened(int centerX, int centerY) { - dismissPopup(false); + dismissPopup(); mActivity.cancelActivityTouchHandling(); mActivity.setSwipingEnabled(false); if (mFaceView != null) { |