From 78f53856a98dbc01aa86a1540ae23a7a9b0052bb Mon Sep 17 00:00:00 2001 From: Sreyas Date: Mon, 27 Apr 2020 13:29:57 -0700 Subject: [PATCH] Disabling OverviewActionsView buttons while scrolling or clear all shown. Bug: 153469850, 153387526 Video: https://drive.google.com/a/google.com/file/d/1mOc8yubux92iKtXRtSOKTcnjWWzvDgC7/view?usp=sharing Change-Id: Id507d3a050e67057fc34a30771c9566ddfcf94ca --- .../android/quickstep/views/RecentsView.java | 11 +++++++++++ quickstep/res/values/styles.xml | 4 ++-- .../android/quickstep/util/LayoutUtils.java | 19 +++++++++++++++++++ res/color/overview_button.xml | 11 +++++++++++ 4 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 res/color/overview_button.xml 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 d9cbe0bc62..31563ad03c 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 @@ -123,6 +123,7 @@ import com.android.quickstep.TaskThumbnailCache; import com.android.quickstep.TaskUtils; import com.android.quickstep.ViewUtils; import com.android.quickstep.util.AppWindowAnimationHelper; +import com.android.quickstep.util.LayoutUtils; import com.android.quickstep.util.RecentsOrientedState; import com.android.quickstep.util.WindowSizeStrategy; import com.android.systemui.plugins.ResourceProvider; @@ -597,9 +598,18 @@ public abstract class RecentsView extends PagedView impl } } + @Override + protected void onPageBeginTransition() { + super.onPageBeginTransition(); + LayoutUtils.setViewEnabled(mActionsView, false); + } + @Override protected void onPageEndTransition() { super.onPageEndTransition(); + if (getScrollX() == getScrollForPage(getPageNearestToCenterOfScreen())) { + LayoutUtils.setViewEnabled(mActionsView, true); + } if (getNextPage() > 0) { setSwipeDownShouldLaunchApp(true); } @@ -958,6 +968,7 @@ public abstract class RecentsView extends PagedView impl setCurrentPage(0); mDwbToastShown = false; mActivity.getSystemUiController().updateUiState(UI_STATE_OVERVIEW, 0); + LayoutUtils.setViewEnabled(mActionsView, true); } public @Nullable TaskView getRunningTaskView() { diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml index c97ee7c52a..d3c4f4d93b 100644 --- a/quickstep/res/values/styles.xml +++ b/quickstep/res/values/styles.xml @@ -79,8 +79,8 @@