Fix bug 4818050 - Need a way to get notified when a PopupMenu gets (42b91bbc) · Commits · e / os / android_frameworks_base

api/current.txt

+6 −0

Original line number	Diff line number	Diff line
		@@ -25281,10 +25281,16 @@ package android.widget {
		method public void dismiss();
		method public android.view.Menu getMenu();
		method public android.view.MenuInflater getMenuInflater();
		method public void inflate(int);
		method public void setOnDismissListener(android.widget.PopupMenu.OnDismissListener);
		method public void setOnMenuItemClickListener(android.widget.PopupMenu.OnMenuItemClickListener);
		method public void show();
		}

		public static abstract interface PopupMenu.OnDismissListener {
		method public abstract void onDismiss(android.widget.PopupMenu);
		}

		public static abstract interface PopupMenu.OnMenuItemClickListener {
		method public abstract boolean onMenuItemClick(android.view.MenuItem);
		}

core/java/android/widget/PopupMenu.java

+43 −2

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.widget;

		import com.android.internal.view.menu.MenuBuilder;
		import com.android.internal.view.menu.MenuPopupHelper;
		import com.android.internal.view.menu.MenuPresenter;
		import com.android.internal.view.menu.SubMenuBuilder;

		import android.content.Context;
		@@ -32,12 +33,25 @@ import android.view.View;
		* If the IME is visible the popup will not overlap it until it is touched. Touching outside
		* of the popup will dismiss it.
		*/
		public class PopupMenu implements MenuBuilder.Callback {
		public class PopupMenu implements MenuBuilder.Callback, MenuPresenter.Callback {
		private Context mContext;
		private MenuBuilder mMenu;
		private View mAnchor;
		private MenuPopupHelper mPopup;
		private OnMenuItemClickListener mMenuItemClickListener;
		private OnDismissListener mDismissListener;

		/**
		* Callback interface used to notify the application that the menu has closed.
		*/
		public interface OnDismissListener {
		/**
		* Called when the associated menu has been dismissed.
		*
		* @param menu The PopupMenu that was dismissed.
		*/
		public void onDismiss(PopupMenu menu);
		}

		/**
		* Construct a new PopupMenu.
		@@ -53,6 +67,7 @@ public class PopupMenu implements MenuBuilder.Callback {
		mMenu.setCallback(this);
		mAnchor = anchor;
		mPopup = new MenuPopupHelper(context, mMenu, anchor);
		mPopup.setCallback(this);
		}

		/**
		@@ -76,6 +91,15 @@ public class PopupMenu implements MenuBuilder.Callback {
		return new MenuInflater(mContext);
		}

		/**
		* Inflate a menu resource into this PopupMenu. This is equivalent to calling
		* popupMenu.getMenuInflater().inflate(menuRes, popupMenu.getMenu()).
		* @param menuRes Menu resource to inflate
		*/
		public void inflate(int menuRes) {
		getMenuInflater().inflate(menuRes, mMenu);
		}

		/**
		* Show the menu popup anchored to the view specified during construction.
		* @see #dismiss()
		@@ -92,10 +116,24 @@ public class PopupMenu implements MenuBuilder.Callback {
		mPopup.dismiss();
		}

		/**
		* Set a listener that will be notified when the user selects an item from the menu.
		*
		* @param listener Listener to notify
		*/
		public void setOnMenuItemClickListener(OnMenuItemClickListener listener) {
		mMenuItemClickListener = listener;
		}

		/**
		* Set a listener that will be notified when this menu is dismissed.
		*
		* @param listener Listener to notify
		*/
		public void setOnDismissListener(OnDismissListener listener) {
		mDismissListener = listener;
		}

		/**
		* @hide
		*/
		@@ -110,12 +148,15 @@ public class PopupMenu implements MenuBuilder.Callback {
		* @hide
		*/
		public void onCloseMenu(MenuBuilder menu, boolean allMenusAreClosing) {
		if (mDismissListener != null) {
		mDismissListener.onDismiss(this);
		}
		}

		/**
		* @hide
		*/
		public boolean onSubMenuSelected(SubMenuBuilder subMenu) {
		public boolean onOpenSubMenu(MenuBuilder subMenu) {
		if (!subMenu.hasVisibleItems()) {
		return true;
		}

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -126,6 +126,7 @@ public class MenuPopupHelper implements AdapterView.OnItemClickListener, View.On

		public void onDismiss() {
		mPopup = null;
		mMenu.close();
		if (mTreeObserver != null) {
		if (!mTreeObserver.isAlive()) mTreeObserver = mAnchorView.getViewTreeObserver();
		mTreeObserver.removeGlobalOnLayoutListener(this);