Merge "Fix divider visibility issue on transient taskbar" into tm-qpr-dev am: d058f55578 am: 9898e5cc44
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20747781 Change-Id: I9e780abb3987bf8c40f24fafb5f906ff659ddee8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -322,6 +322,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;
|
||||
@@ -764,6 +765,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);
|
||||
}
|
||||
@@ -1666,7 +1671,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() {
|
||||
@@ -2302,6 +2309,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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user