Merge "Skip bubble transition when bubble bar is not showing" into main (de77c38c) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleTransitions.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -129,6 +129,13 @@ public class BubbleTransitions {
		mBubbleController = controller;
		}

		/**
		* Returns whether bubbles are showing as the bubble bar.
		*/
		public boolean isShowingAsBubbleBar() {
		return mBubbleController.isShowingAsBubbleBar();
		}

		/**
		* Returns whether there is a pending transition for the given request.
		*/

+6 −2

Original line number	Diff line number	Diff line
		@@ -761,7 +761,9 @@ public class DefaultMixedHandler implements MixedTransitionHandler,
		public boolean requestHasBubbleEnter(TransitionRequestInfo request) {
		return BubbleAnythingFlagHelper.enableCreateAnyBubble()
		&& request.getTriggerTask() != null
		&& mBubbleTransitions.hasPendingEnterTransition(request);
		&& mBubbleTransitions.hasPendingEnterTransition(request)
		// TODO(b/408453889): To be removed once we handle transitions with stack view
		&& mBubbleTransitions.isShowingAsBubbleBar();
		}

		/**
		@@ -771,7 +773,9 @@ public class DefaultMixedHandler implements MixedTransitionHandler,
		public boolean requestHasBubbleEnterFromAppBubble(TransitionRequestInfo request) {
		return BubbleAnythingFlagHelper.enableCreateAnyBubble()
		&& request.getTriggerTask() != null
		&& request.getTriggerTask().isAppBubble;
		&& request.getTriggerTask().isAppBubble
		// TODO(b/408453889): To be removed once we handle transitions with stack view
		&& mBubbleTransitions.isShowingAsBubbleBar();
		}

		@Override