Merge "Fix divider visibility issue on transient taskbar" into tm-qpr-dev (d058f555) · Commits · e / os / android_packages_apps_Trebuchet

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

+12 −1

Original line number	Diff line number	Diff line
		@@ -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,8 +1674,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
		mRecentsAnimationController.enableInputConsumer();

		// Start hiding the divider
		if (!mIsTransientTaskbar \|\| mTaskbarAlreadyOpen \|\| mIsTaskbarAllAppsOpen) {
		setDividerShown(false /* shown /, true / immediate */);
		}
		}

		private void computeRecentsScrollIfInvisible() {
		if (mRecentsView != null && mRecentsView.getVisibility() != View.VISIBLE) {
		@@ -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);
		}