Merge "Fix taskbar spring when going from home to overview." into tm-qpr-dev (35d4b6d2) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ public class TaskbarStashInputConsumer extends DelegateInputConsumer {
		private final float mScreenWidth;

		private final int mTaskbarNavThreshold;
		private final int mTaskbarNavThresholdY;
		private final boolean mIsTaskbarAllAppsOpen;
		private boolean mHasPassedTaskbarNavThreshold;

		@@ -74,6 +75,8 @@ public class TaskbarStashInputConsumer extends DelegateInputConsumer {
		Resources res = context.getResources();
		mUnstashArea = res.getDimensionPixelSize(R.dimen.taskbar_unstash_input_area);
		mTaskbarNavThreshold = res.getDimensionPixelSize(R.dimen.taskbar_nav_threshold);
		mTaskbarNavThresholdY = taskbarActivityContext.getDeviceProfile().heightPx
		- mTaskbarNavThreshold;
		mIsTaskbarAllAppsOpen =
		mTaskbarActivityContext != null && mTaskbarActivityContext.isTaskbarAllAppsOpen();

		@@ -163,7 +166,7 @@ public class TaskbarStashInputConsumer extends DelegateInputConsumer {
		}

		if (dY < 0) {
		dY = -OverScroll.dampedScroll(-dY, mTaskbarNavThreshold);
		dY = -OverScroll.dampedScroll(-dY, mTaskbarNavThresholdY);
		if (mTransitionCallback != null && !mIsTaskbarAllAppsOpen) {
		mTransitionCallback.onActionMove(dY);
		}