From 7d192c0e71212cf0e1bbc35f0c21c6754eb6c297 Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Thu, 5 Jan 2023 19:51:16 +0000 Subject: [PATCH] Remove extra overview threshold if the transient taskbar is already open Test: Swipe to overview when taskbar is already opened vs not Fixes: 264555943 Change-Id: Ib4c31b085ca51e50fd7442ff9a27a5f47822c242 --- .../src/com/android/quickstep/AbsSwipeUpHandler.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index 857ace25b1..36059437db 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -365,10 +365,13 @@ public abstract class AbsSwipeUpHandler, .getDimensionPixelSize(ENABLE_TASKBAR_REVISED_THRESHOLDS.get() ? R.dimen.taskbar_app_window_threshold_v2 : R.dimen.taskbar_app_window_threshold); - mTaskbarHomeOverviewThreshold = res.getDimensionPixelSize( - ENABLE_TASKBAR_REVISED_THRESHOLDS.get() - ? R.dimen.taskbar_home_overview_threshold_v2 - : R.dimen.taskbar_home_overview_threshold); + boolean swipeWillNotShowTaskbar = mTaskbarAlreadyOpen; + mTaskbarHomeOverviewThreshold = swipeWillNotShowTaskbar + ? 0 + : res.getDimensionPixelSize( + ENABLE_TASKBAR_REVISED_THRESHOLDS.get() + ? R.dimen.taskbar_home_overview_threshold_v2 + : R.dimen.taskbar_home_overview_threshold); mTaskbarCatchUpThreshold = res.getDimensionPixelSize(R.dimen.taskbar_catch_up_threshold); }