am f175b19a: Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev (96192157) · Commits · e / os / android_frameworks_base

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

+18 −18

Original line number	Diff line number	Diff line
		@@ -164,8 +164,24 @@ public class ActionMenuPresenter extends BaseMenuPresenter
		}
		actionView.setVisibility(item.isActionViewExpanded() ? View.GONE : View.VISIBLE);

		final ActionMenuView menuParent = (ActionMenuView) parent;
		final ViewGroup.LayoutParams lp = actionView.getLayoutParams();
		if (!menuParent.checkLayoutParams(lp)) {
		actionView.setLayoutParams(menuParent.generateLayoutParams(lp));
		}
		return actionView;
		}

		@Override
		public void bindItemView(final MenuItemImpl item, MenuView.ItemView itemView) {
		itemView.initialize(item, 0);

		final ActionMenuView menuView = (ActionMenuView) mMenuView;
		final ActionMenuItemView actionItemView = (ActionMenuItemView) itemView;
		actionItemView.setItemInvoker(menuView);

		if (item.hasSubMenu()) {
		actionView.setOnTouchListener(new ForwardingListener(actionView) {
		actionItemView.setOnTouchListener(new ForwardingListener(actionItemView) {
		@Override
		public ListPopupWindow getPopup() {
		return mActionButtonPopup != null ? mActionButtonPopup.getPopup() : null;
		@@ -182,24 +198,8 @@ public class ActionMenuPresenter extends BaseMenuPresenter
		}
		});
		} else {
		actionView.setOnTouchListener(null);
		actionItemView.setOnTouchListener(null);
		}

		final ActionMenuView menuParent = (ActionMenuView) parent;
		final ViewGroup.LayoutParams lp = actionView.getLayoutParams();
		if (!menuParent.checkLayoutParams(lp)) {
		actionView.setLayoutParams(menuParent.generateLayoutParams(lp));
		}
		return actionView;
		}

		@Override
		public void bindItemView(MenuItemImpl item, MenuView.ItemView itemView) {
		itemView.initialize(item, 0);

		final ActionMenuView menuView = (ActionMenuView) mMenuView;
		ActionMenuItemView actionItemView = (ActionMenuItemView) itemView;
		actionItemView.setItemInvoker(menuView);
		}

		@Override