Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 049dd3d4 authored Dec 02, 2010 by Adam Powell

Fix bug 3248786 - silly monkeys.

Change-Id: I41306cae06a7b4fd3852e0760ae668c8d6eacc5d

parent 5e3af5fc

core/java/android/app/Activity.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -2363,7 +2363,11 @@ public class Activity extends ContextThemeWrapper
		*/
		public boolean onMenuOpened(int featureId, Menu menu) {
		if (featureId == Window.FEATURE_ACTION_BAR) {
		if (mActionBar != null) {
		mActionBar.dispatchMenuVisibilityChanged(true);
		} else {
		Log.e(TAG, "Tried to open action bar menu with no action bar");
		}
		}
		return true;
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -867,7 +867,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		if (panel.isOpen) {
		// The window manager will give us a valid window token
		new MenuDialogHelper(subMenu).show(null);
		} else {
		} else if (hasFeature(FEATURE_ACTION_BAR)) {
		mActionButtonPopup = new ActionButtonSubmenu(getContext(), subMenu);
		mActionButtonPopup.show();
		Callback cb = getCallback();