Merge "Dispatch the actual PopupWindow dismiss callback to PopupMenu" (3c5aeef5) · Commits · e / os / android_frameworks_base

core/java/android/widget/ActionMenuPresenter.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -937,10 +937,11 @@ public class ActionMenuPresenter extends BaseMenuPresenter
		}

		@Override
		public void onDismiss() {
		super.onDismiss();
		protected void onDismiss() {
		mMenu.close();
		mOverflowPopup = null;

		super.onDismiss();
		}
		}

		@@ -959,10 +960,11 @@ public class ActionMenuPresenter extends BaseMenuPresenter
		}

		@Override
		public void onDismiss() {
		super.onDismiss();
		protected void onDismiss() {
		mActionButtonPopup = null;
		mOpenSubMenuId = 0;

		super.onDismiss();
		}
		}

core/java/android/widget/PopupMenu.java

+6 −14

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package android.widget;
		import com.android.internal.R;
		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.ShowableListMenu;

		import android.annotation.MenuRes;
		@@ -45,7 +44,7 @@ public class PopupMenu {
		private final MenuPopupHelper mPopup;

		private OnMenuItemClickListener mMenuItemClickListener;
		private OnDismissListener mDismissListener;
		private OnDismissListener mOnDismissListener;
		private OnTouchListener mDragListener;

		/**
		@@ -114,20 +113,13 @@ public class PopupMenu {

		mPopup = new MenuPopupHelper(context, mMenu, anchor, false, popupStyleAttr, popupStyleRes);
		mPopup.setGravity(gravity);
		mPopup.setCallback(new MenuPresenter.Callback() {
		mPopup.setOnDismissListener(new PopupWindow.OnDismissListener() {
		@Override
		public void onCloseMenu(MenuBuilder menu, boolean allMenusAreClosing) {
		if (mDismissListener != null) {
		mDismissListener.onDismiss(PopupMenu.this);
		public void onDismiss() {
		if (mOnDismissListener != null) {
		mOnDismissListener.onDismiss(PopupMenu.this);
		}
		}

		@Override
		public boolean onOpenSubMenu(MenuBuilder subMenu) {
		// The menu presenter will handle opening the submenu itself.
		// Nothing to do here.
		return false;
		}
		});
		}

		@@ -259,7 +251,7 @@ public class PopupMenu {
		* @param listener the listener to notify
		*/
		public void setOnDismissListener(OnDismissListener listener) {
		mDismissListener = listener;
		mOnDismissListener = listener;
		}

		/**

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

+128 −74

Original line number	Diff line number	Diff line
		@@ -18,86 +18,104 @@ package com.android.internal.view.menu;

		import com.android.internal.view.menu.MenuPresenter.Callback;

		import android.annotation.AttrRes;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.StyleRes;
		import android.content.Context;
		import android.view.Gravity;
		import android.view.View;
		import android.widget.PopupWindow;
		import android.widget.PopupWindow.OnDismissListener;

		/**
		* Presents a menu as a small, simple popup anchored to another view.
		*
		* @hide
		*/
		public class MenuPopupHelper implements PopupWindow.OnDismissListener {
		public class MenuPopupHelper {
		private final Context mContext;

		// Immutable cached popup menu properties.
		private final MenuBuilder mMenu;
		private final boolean mOverflowOnly;
		private final int mPopupStyleAttr;
		private final int mPopupStyleRes;

		// Mutable cached popup menu properties.
		private View mAnchorView;
		private MenuPopup mPopup;

		private int mDropDownGravity = Gravity.START;
		private boolean mForceShowIcon;
		private boolean mShowTitle;
		private Callback mPresenterCallback;

		private int mInitXOffset;
		private int mInitYOffset;

		/** Whether the popup has anchor-relative offsets. */
		private boolean mHasOffsets;
		private MenuPopup mPopup;
		private OnDismissListener mOnDismissListener;

		public MenuPopupHelper(Context context, MenuBuilder menu) {
		public MenuPopupHelper(@NonNull Context context, @NonNull MenuBuilder menu) {
		this(context, menu, null, false, com.android.internal.R.attr.popupMenuStyle, 0);
		}

		public MenuPopupHelper(Context context, MenuBuilder menu, View anchorView) {
		public MenuPopupHelper(@NonNull Context context, @NonNull MenuBuilder menu,
		@NonNull View anchorView) {
		this(context, menu, anchorView, false, com.android.internal.R.attr.popupMenuStyle, 0);
		}

		public MenuPopupHelper(Context context, MenuBuilder menu, View anchorView,
		boolean overflowOnly, int popupStyleAttr) {
		public MenuPopupHelper(@NonNull Context context, @NonNull MenuBuilder menu,
		@NonNull View anchorView,
		boolean overflowOnly, @AttrRes int popupStyleAttr) {
		this(context, menu, anchorView, overflowOnly, popupStyleAttr, 0);
		}

		public MenuPopupHelper(Context context, MenuBuilder menu, View anchorView,
		boolean overflowOnly, int popupStyleAttr, int popupStyleRes) {
		public MenuPopupHelper(@NonNull Context context, @NonNull MenuBuilder menu,
		@NonNull View anchorView, boolean overflowOnly, @AttrRes int popupStyleAttr,
		@StyleRes int popupStyleRes) {
		mContext = context;
		mMenu = menu;
		mAnchorView = anchorView;
		mOverflowOnly = overflowOnly;
		mPopupStyleAttr = popupStyleAttr;
		mPopupStyleRes = popupStyleRes;
		mAnchorView = anchorView;
		mPopup = createMenuPopup();
		}

		private MenuPopup createMenuPopup() {
		if (mContext.getResources().getBoolean(
		com.android.internal.R.bool.config_enableCascadingSubmenus)) {
		return new CascadingMenuPopup(mContext, mAnchorView, mPopupStyleAttr, mPopupStyleRes,
		mOverflowOnly);
		}
		return new StandardMenuPopup(
		mContext, mMenu, mAnchorView, mPopupStyleAttr, mPopupStyleRes, mOverflowOnly);
		public void setOnDismissListener(@Nullable OnDismissListener listener) {
		mOnDismissListener = listener;
		}

		public void setAnchorView(View anchor) {
		/**
		* Sets the view to which the popup window is anchored.
		* <p>
		* Changes take effect on the next call to show().
		*
		* @param anchor the view to which the popup window should be anchored
		*/
		public void setAnchorView(@NonNull View anchor) {
		mAnchorView = anchor;
		mPopup.setAnchorView(anchor);
		}

		public void setForceShowIcon(boolean forceShow) {
		mForceShowIcon = forceShow;
		mPopup.setForceShowIcon(forceShow);
		/**
		* Sets whether the popup menu's adapter is forced to show icons in the
		* menu item views.
		* <p>
		* Changes take effect on the next call to show().
		*
		* @param forceShowIcon {@code true} to force icons to be shown, or
		* {@code false} for icons to be optionally shown
		*/
		public void setForceShowIcon(boolean forceShowIcon) {
		mForceShowIcon = forceShowIcon;
		}

		/**
		* Sets the alignment of the popup window relative to the anchor view.
		* <p>
		* Changes take effect on the next call to show().
		*
		* @param gravity alignment of the popup relative to the anchor
		*/
		public void setGravity(int gravity) {
		mDropDownGravity = gravity;
		mPopup.setGravity(gravity);
		}

		/**
		* @return alignment of the popup relative to the anchor
		*/
		public int getGravity() {
		return mDropDownGravity;
		}
		@@ -114,7 +132,11 @@ public class MenuPopupHelper implements PopupWindow.OnDismissListener {
		}
		}

		public ShowableListMenu getPopup() {
		@NonNull
		public MenuPopup getPopup() {
		if (mPopup == null) {
		mPopup = createPopup();
		}
		return mPopup;
		}

		@@ -133,12 +155,7 @@ public class MenuPopupHelper implements PopupWindow.OnDismissListener {
		return false;
		}

		mInitXOffset = 0;
		mInitYOffset = 0;
		mHasOffsets = false;
		mShowTitle = false;

		showPopup();
		showPopup(0, 0, false, false);
		return true;
		}

		@@ -169,67 +186,104 @@ public class MenuPopupHelper implements PopupWindow.OnDismissListener {
		return false;
		}

		mInitXOffset = x;
		mInitYOffset = y;
		mHasOffsets = true;
		mShowTitle = true;

		showPopup();
		showPopup(x, y, true, true);
		return true;
		}

		private void showPopup() {
		mPopup = createMenuPopup();
		mPopup.setAnchorView(mAnchorView);
		mPopup.setCallback(mPresenterCallback);
		mPopup.setForceShowIcon(mForceShowIcon);
		mPopup.setGravity(mDropDownGravity);
		mPopup.setShowTitle(mShowTitle);
		/**
		* Creates the popup and assigns cached properties.
		*
		* @return an initialized popup
		*/
		@NonNull
		private MenuPopup createPopup() {
		final boolean enableCascadingSubmenus = mContext.getResources().getBoolean(
		com.android.internal.R.bool.config_enableCascadingSubmenus);

		final MenuPopup popup;
		if (enableCascadingSubmenus) {
		popup = new CascadingMenuPopup(mContext, mAnchorView, mPopupStyleAttr,
		mPopupStyleRes, mOverflowOnly);
		} else {
		popup = new StandardMenuPopup(mContext, mMenu, mAnchorView, mPopupStyleAttr,
		mPopupStyleRes, mOverflowOnly);
		}

		// Assign immutable properties.
		popup.addMenu(mMenu);
		popup.setOnDismissListener(mInternalOnDismissListener);

		// Assign mutable properties. These may be reassigned later.
		popup.setAnchorView(mAnchorView);
		popup.setCallback(mPresenterCallback);
		popup.setForceShowIcon(mForceShowIcon);
		popup.setGravity(mDropDownGravity);

		return popup;
		}

		if (mHasOffsets) {
		private void showPopup(int xOffset, int yOffset, boolean resolveOffsets, boolean showTitle) {
		if (resolveOffsets) {
		// If the resolved drop-down gravity is RIGHT, the popup's right
		// edge will be aligned with the anchor view. Adjust by the anchor
		// width such that the top-right corner is at the X offset.
		final int hgrav = Gravity.getAbsoluteGravity(mDropDownGravity,
		mAnchorView.getLayoutDirection()) & Gravity.HORIZONTAL_GRAVITY_MASK;
		final int resolvedXOffset;
		if (hgrav == Gravity.RIGHT) {
		resolvedXOffset = mInitXOffset - mAnchorView.getWidth();
		} else {
		resolvedXOffset = mInitXOffset;
		xOffset -= mAnchorView.getWidth();
		}

		mPopup.setHorizontalOffset(resolvedXOffset);
		mPopup.setVerticalOffset(mInitYOffset);
		}

		// In order for subclasses of MenuPopupHelper to satisfy the OnDismissedListener interface,
		// we must set the listener to this outer Helper rather than to the inner MenuPopup.
		// Not to worry -- the inner MenuPopup will call our own #onDismiss method after it's done
		// its own handling.
		mPopup.setOnDismissListener(this);

		mPopup.addMenu(mMenu);
		mPopup.show();
		final MenuPopup popup = getPopup();
		popup.setHorizontalOffset(xOffset);
		popup.setVerticalOffset(yOffset);
		popup.setShowTitle(showTitle);
		popup.show();
		}

		/**
		* Dismisses the popup, if showing.
		*/
		public void dismiss() {
		if (isShowing()) {
		mPopup.dismiss();
		}
		}

		@Override
		public void onDismiss() {
		/**
		* Called after the popup has been dismissed.
		* <p>
		* <strong>Note:</strong> Subclasses should call the super implementation
		* last to ensure that any necessary tear down has occurred before the
		* listener specified by {@link #setOnDismissListener(OnDismissListener)}
		* is called.
		*/
		protected void onDismiss() {
		mPopup = null;

		if (mOnDismissListener != null) {
		mOnDismissListener.onDismiss();
		}
		}

		public boolean isShowing() {
		return mPopup != null && mPopup.isShowing();
		}

		public void setCallback(MenuPresenter.Callback cb) {
		public void setCallback(@Nullable MenuPresenter.Callback cb) {
		mPresenterCallback = cb;
		if (mPopup != null) {
		mPopup.setCallback(cb);
		}
		}

		/**
		* Listener used to proxy dismiss callbacks to the helper's owner.
		*/
		private final OnDismissListener mInternalOnDismissListener = new OnDismissListener() {
		@Override
		public void onDismiss() {
		MenuPopupHelper.this.onDismiss();
		}
		};
		}