Merge "Removed stashing hotseat calls." into main (f85a484a) · Commits · e / os / BlissLauncher3

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

+10 −2

Original line number	Diff line number	Diff line
		@@ -410,12 +410,20 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
		return mIsStashed;
		}

		/** Sets the hotseat stashed. */
		/**
		* Sets the hotseat stashed.
		* b/373429249 - we might change this behavior if we remove the scrim, that's why we're keeping
		* this method
		*/
		public void stashHotseat(boolean stash) {
		mControllers.uiController.stashHotseat(stash);
		}

		/** Instantly un-stashes the hotseat. */
		/**
		* Instantly un-stashes the hotseat.
		* * b/373429249 - we might change this behavior if we remove the scrim, that's why we're
		* keeping this method
		*/
		public void unStashHotseatInstantly() {
		mControllers.uiController.unStashHotseatInstantly();
		}

+3 −9

Original line number	Diff line number	Diff line
		@@ -856,23 +856,17 @@ public class BubbleBarViewController {

		/**
		* Hides the persistent taskbar if it is going to intersect with the expanded bubble bar if in
		* app or overview. Set the hotseat stashed state if on launcher home screen. If not on launcher
		* home screen and hotseat is stashed immediately un-stashes the hotseat.
		* app or overview.
		*/
		private void adjustTaskbarAndHotseatToBubbleBarState(boolean isBubbleBarExpanded) {
		if (mBubbleStashController.isBubblesShowingOnHome()) {
		mTaskbarStashController.stashHotseat(isBubbleBarExpanded);
		} else if (!mBubbleStashController.isTransientTaskBar()) {
		if (!mBubbleStashController.isBubblesShowingOnHome()
		&& !mBubbleStashController.isTransientTaskBar()) {
		boolean hideTaskbar = isBubbleBarExpanded && isIntersectingTaskbar();
		mTaskbarViewPropertiesProvider
		.getIconsAlpha()
		.animateToValue(hideTaskbar ? 0 : 1)
		.start();
		}
		if (!mBubbleStashController.isBubblesShowingOnHome()
		&& mTaskbarStashController.isHiddenForBubbles()) {
		mTaskbarStashController.unStashHotseatInstantly();
		}
		}

		/** Return {@code true} if expanded bubble bar would intersect the taskbar. */