Merge "Fix launcher crash by set divider hidden" into tm-qpr-dev (f8176700) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -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();
		}