Merge "Fix Task Icon menu behavior." into ub-launcher3-rvc-dev (726c7816) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -607,6 +607,10 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
		}
		}

		public boolean isCenterPageTask() {
		return getScrollX() == getScrollForPage(getPageNearestToCenterOfScreen());
		}

		@Override
		protected void onPageBeginTransition() {
		super.onPageBeginTransition();
		@@ -616,7 +620,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
		@Override
		protected void onPageEndTransition() {
		super.onPageEndTransition();
		if (getScrollX() == getScrollForPage(getPageNearestToCenterOfScreen())) {
		if (isCenterPageTask()) {
		LayoutUtils.setViewEnabled(mActionsView, true);
		}
		if (getNextPage() > 0) {

+10 −7

Original line number	Diff line number	Diff line
		@@ -425,7 +425,9 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
		}

		private boolean showTaskMenu(int action) {
		if (!getRecentsView().isCenterPageTask()) {
		getRecentsView().snapToPage(getRecentsView().indexOfChild(this));
		} else {
		mMenuView = TaskMenuView.showForTask(this);
		mActivity.getStatsLogManager().log(LAUNCHER_TASK_ICON_TAP_OR_LONGPRESS, buildProto());
		UserEventDispatcher.newInstance(getContext()).logActionOnItem(action, Direction.NONE,
		@@ -433,6 +435,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
		if (mMenuView != null) {
		mMenuView.addOnAttachStateChangeListener(mTaskMenuStateListener);
		}
		}
		return mMenuView != null;
		}