From 23986e9a843183d83eebd7e81dbf129d791db099 Mon Sep 17 00:00:00 2001 From: Becky Qiu Date: Tue, 9 Jun 2020 23:42:19 +0000 Subject: [PATCH] Revert "Fix Task Icon menu behavior." This reverts commit 6df0148b07684e9d58a43ca2f10f33ee6f4bf5c6. Reason for revert: breaks the task icon behavior. Change-Id: I6f654478e0ffe7827efeca1553622dad2e02c5da --- .../android/quickstep/views/RecentsView.java | 6 +----- .../com/android/quickstep/views/TaskView.java | 17 +++++++---------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java index ee8d4a1e8b..98784efdc1 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java @@ -607,10 +607,6 @@ public abstract class RecentsView extends PagedView impl } } - public boolean isCenterPageTask() { - return getScrollX() == getScrollForPage(getPageNearestToCenterOfScreen()); - } - @Override protected void onPageBeginTransition() { super.onPageBeginTransition(); @@ -620,7 +616,7 @@ public abstract class RecentsView extends PagedView impl @Override protected void onPageEndTransition() { super.onPageEndTransition(); - if (isCenterPageTask()) { + if (getScrollX() == getScrollForPage(getPageNearestToCenterOfScreen())) { LayoutUtils.setViewEnabled(mActionsView, true); } if (getNextPage() > 0) { diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java index 5176f2c76c..cadf6c4174 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java @@ -425,16 +425,13 @@ 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, - LauncherLogProto.ItemType.TASK_ICON); - if (mMenuView != null) { - mMenuView.addOnAttachStateChangeListener(mTaskMenuStateListener); - } + getRecentsView().snapToPage(getRecentsView().indexOfChild(this)); + mMenuView = TaskMenuView.showForTask(this); + mActivity.getStatsLogManager().log(LAUNCHER_TASK_ICON_TAP_OR_LONGPRESS, buildProto()); + UserEventDispatcher.newInstance(getContext()).logActionOnItem(action, Direction.NONE, + LauncherLogProto.ItemType.TASK_ICON); + if (mMenuView != null) { + mMenuView.addOnAttachStateChangeListener(mTaskMenuStateListener); } return mMenuView != null; }