Merge "Remove extra overview threshold if the transient taskbar is already open" into tm-qpr-dev am: a329718dcf am: 4f90d44377

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20886425

Change-Id: I046559dca1c9e2866005de73663ca9e5d32940b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tony Wickham
2023-01-14 03:18:59 +00:00
committed by Automerger Merge Worker
@@ -368,10 +368,13 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
.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);
}