Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix top level menu lingering when submenu opens." into nyc-dev

Browse Source 
am: 7ce082a

* commit '7ce082a46259e948e4ea6a12f327f32aecaf167a':
  Fix top level menu lingering when submenu opens.

Change-Id: I994fe5fa29f9b10c0d7a8e4dd306fe2e4f35df7e
This commit is contained in:
Oren Blasberg
2016-04-07 22:50:43 +00:00
committed by android-build-merger
parent ee03cdf9a7 7ce082a462
commit 3fe68e14b0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/com/android/internal/view/menu/StandardMenuPopup.java
View File

@@ -208,7 +208,7 @@ final class StandardMenuPopup extends MenuPopup implements OnDismissListener, On
@Override @Override
public void show() { public void show() {
if (!tryShow()) { if (!tryShow()) {
throw new IllegalStateException("MenuPopupHelper cannot be used without an anchor"); throw new IllegalStateException("StandardMenuPopup cannot be used without an anchor");
} }
} }
@@ -273,7 +273,7 @@ final class StandardMenuPopup extends MenuPopup implements OnDismissListener, On
mOnDismissListener = null; mOnDismissListener = null;
// Close this menu popup to make room for the submenu popup. // Close this menu popup to make room for the submenu popup.
dismiss(); mMenu.close(false /* closeAllMenus */);
// Show the new sub-menu popup at the same location as this popup. // Show the new sub-menu popup at the same location as this popup.
if (subPopup.tryShow(mXOffset, mYOffset)) { if (subPopup.tryShow(mXOffset, mYOffset)) {