aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 19:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix launcher crash by set divider hidden" into tm-qpr-dev am: f8176700d3

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

Change-Id: I7bdc51009808c5ad209367be19d8fe3e96f74985
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tony Wickham
2023-01-17 22:32:40 +00:00
committed by Automerger Merge Worker
parent c3317801ba f8176700d3
commit 763a9f2059
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
View File

@@ -324,6 +324,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
// May be set to false when mIsTransientTaskbar is true.
private boolean mCanSlowSwipeGoHome = true;
private boolean mHasReachedOverviewThreshold = false;
private boolean mDividerHiddenBeforeAnimation = false;
@Nullable
private RemoteAnimationTargets.ReleaseCheck mSwipePipToHomeReleaseCheck = null;
@@ -1677,7 +1678,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
mRecentsAnimationController.enableInputConsumer();
// Start hiding the divider
if (!mIsTransientTaskbar || mTaskbarAlreadyOpen || mIsTaskbarAllAppsOpen) {
if (!mIsTransientTaskbar || mTaskbarAlreadyOpen || mIsTaskbarAllAppsOpen
|| mDividerHiddenBeforeAnimation) {
setDividerShown(false /* shown */, true /* immediate */);
}
}
@@ -2327,6 +2329,12 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
}
private void setDividerShown(boolean shown, boolean immediate) {
if (mRecentsAnimationTargets == null) {
if (!shown) {
mDividerHiddenBeforeAnimation = true;
}
return;
}
if (mDividerAnimator != null) {
mDividerAnimator.cancel();
}