Merge "Prevent empty overflow popup when there are no overflow items."

Author: Jean-Baptiste Queru

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

@@ -277,7 +277,7 @@ private View findViewForItem(MenuItem item) {
      */
     public boolean showOverflowMenu() {
         if (mReserveOverflow && !isOverflowMenuShowing() && mMenu != null && mMenuView != null &&
-                mPostedOpenRunnable == null) {
+                mPostedOpenRunnable == null && !mMenu.getNonActionItems().isEmpty()) {
             OverflowPopup popup = new OverflowPopup(mContext, mMenu, mOverflowButton, true);
             mPostedOpenRunnable = new OpenOverflowRunnable(popup);
             // Post this for later; we might still need a layout for the anchor to be right.