Merge "Revert to passing mIsStashed to StashedHandleViewController again" into main (7eceb5b1) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/taskbar/StashedHandleViewController.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -155,7 +155,7 @@ public class StashedHandleViewController implements TaskbarControllers.LoggableT
		});
		initRegionSampler();
		if (mActivity.isPhoneGestureNavMode()) {
		onIsStashedChanged();
		onIsStashedChanged(true);
		}
		}

		@@ -238,8 +238,8 @@ public class StashedHandleViewController implements TaskbarControllers.LoggableT
		}

		/** Called when taskbar is stashed or unstashed. */
		public void onIsStashedChanged() {
		mIsStashed = isStashedHandleVisible();
		public void onIsStashedChanged(boolean isStashed) {
		mIsStashed = isStashed;
		updateSamplingState();
		}

+5 −4

Original line number	Diff line number	Diff line
		@@ -590,7 +590,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
		mAnimator.addListener(AnimatorListeners.forEndCallback(() -> {
		mAnimator = null;
		mIsStashed = isStashed;
		onIsStashedChanged();
		onIsStashedChanged(mIsStashed);
		}));
		return;
		}
		@@ -605,7 +605,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
		@Override
		public void onAnimationStart(Animator animation) {
		mIsStashed = isStashed;
		onIsStashedChanged();
		onIsStashedChanged(mIsStashed);

		cancelTimeoutIfExists();
		}
		@@ -830,9 +830,10 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
		.setDuration(TASKBAR_HINT_STASH_DURATION).start();
		}

		private void onIsStashedChanged() {
		private void onIsStashedChanged(boolean isStashed) {
		mControllers.runAfterInit(() -> {
		mControllers.stashedHandleViewController.onIsStashedChanged();
		mControllers.stashedHandleViewController.onIsStashedChanged(
		isStashed && supportsVisualStashing());
		mControllers.taskbarInsetsController.onTaskbarOrBubblebarWindowHeightOrInsetsChanged();
		});
		}