Merge "Prevent empty overflow popup when there are no overflow items." (2066f7d9) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/view/menu/ActionMenuPresenter.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -277,7 +277,7 @@ public class ActionMenuPresenter extends BaseMenuPresenter
	*/		*/
	public boolean showOverflowMenu() {		public boolean showOverflowMenu() {
	if (mReserveOverflow && !isOverflowMenuShowing() && mMenu != null && mMenuView != null &&		if (mReserveOverflow && !isOverflowMenuShowing() && mMenu != null && mMenuView != null &&
	mPostedOpenRunnable == null) {		mPostedOpenRunnable == null && !mMenu.getNonActionItems().isEmpty()) {
	OverflowPopup popup = new OverflowPopup(mContext, mMenu, mOverflowButton, true);		OverflowPopup popup = new OverflowPopup(mContext, mMenu, mOverflowButton, true);
	mPostedOpenRunnable = new OpenOverflowRunnable(popup);		mPostedOpenRunnable = new OpenOverflowRunnable(popup);
	// Post this for later; we might still need a layout for the anchor to be right.		// Post this for later; we might still need a layout for the anchor to be right.