Merge "Fix divider visibility issue on transient taskbar" into tm-qpr-dev am: d058f55578

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

Change-Id: Ifbd4ea9766123d4c5943f0ea75600416a6b39312
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tony Huang
2023-01-11 04:17:34 +00:00
committed by Automerger Merge Worker

View File

@@ -323,6 +323,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
private final boolean mIsTransientTaskbar;
// May be set to false when mIsTransientTaskbar is true.
private boolean mCanSlowSwipeGoHome = true;
private boolean mHasReachedOverviewThreshold = false;
@Nullable
private RemoteAnimationTargets.ReleaseCheck mSwipePipToHomeReleaseCheck = null;
@@ -765,6 +766,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
private void setIsLikelyToStartNewTask(boolean isLikelyToStartNewTask, boolean animate) {
if (mIsLikelyToStartNewTask != isLikelyToStartNewTask) {
if (isLikelyToStartNewTask && mIsTransientTaskbar) {
setDividerShown(false /* shown */, true /* immediate */);
}
mIsLikelyToStartNewTask = isLikelyToStartNewTask;
maybeUpdateRecentsAttachedState(animate);
}
@@ -1669,7 +1674,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
mRecentsAnimationController.enableInputConsumer();
// Start hiding the divider
setDividerShown(false /* shown */, true /* immediate */);
if (!mIsTransientTaskbar || mTaskbarAlreadyOpen || mIsTaskbarAllAppsOpen) {
setDividerShown(false /* shown */, true /* immediate */);
}
}
private void computeRecentsScrollIfInvisible() {
@@ -2305,6 +2312,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
// "Catch up" with the displacement at mTaskbarCatchUpThreshold.
if (displacement < mTaskbarCatchUpThreshold) {
if (!mHasReachedOverviewThreshold) {
setDividerShown(false /* shown */, true /* immediate */);
mHasReachedOverviewThreshold = true;
}
return Utilities.mapToRange(displacement, mTaskbarAppWindowThreshold,
mTaskbarCatchUpThreshold, 0, mTaskbarCatchUpThreshold, ACCEL_DEACCEL);
}