Merge "Only invoke LaunchOrConvert transition on bubble bar" into main (4313baee) · Commits · e / os / android_frameworks_base

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

+9 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1603,10 +1603,15 @@ public class BubbleController implements ConfigurationChangeListener,
	} else {		} else {
	b.enable(Notification.BubbleMetadata.FLAG_AUTO_EXPAND_BUBBLE);		b.enable(Notification.BubbleMetadata.FLAG_AUTO_EXPAND_BUBBLE);

			if (isShowingAsBubbleBar()) {
	ensureBubbleViewsAndWindowCreated();		ensureBubbleViewsAndWindowCreated();
	mBubbleTransitions.startLaunchIntoOrConvertToBubble(b, mExpandedViewManager,		mBubbleTransitions.startLaunchIntoOrConvertToBubble(b, mExpandedViewManager,
	mBubbleTaskViewFactory, mBubblePositioner, mStackView, mLayerView,		mBubbleTaskViewFactory, mBubblePositioner, mStackView, mLayerView,
	mBubbleIconFactory, mInflateSynchronously);		mBubbleIconFactory, mInflateSynchronously);
			} else {
			inflateAndAdd(b, /* suppressFlyout= / true, / showInShade= */ false,
			updateLocation);
			}
	}		}
	}		}