Merge "Fix a bug when showing the menu panel with an action bar/menu items present." (46eb6de8) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/PhoneWindow.java

+11 −1

Original line number	Diff line number	Diff line
		@@ -511,7 +511,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		}

		// This will populate st.shownPanelView
		if (!initializePanelContent(st) \|\| (st.shownPanelView == null)) {
		if (!initializePanelContent(st) \|\| !st.hasPanelItems()) {
		return;
		}

		@@ -2976,6 +2976,16 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		refreshDecorView = false;
		}

		public boolean hasPanelItems() {
		if (shownPanelView == null) return false;

		if (isInExpandedMode) {
		return expandedMenuPresenter.getAdapter().getCount() > 0;
		} else {
		return ((ViewGroup) shownPanelView).getChildCount() > 0;
		}
		}

		/**
		* Unregister and free attached MenuPresenters. They will be recreated as needed.
		*/