Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 012aad83 authored by Winson Chung's avatar Winson Chung
Browse files

Only invoke LaunchOrConvert transition on bubble bar 

- Until we refactor the transitions to account for floating bubbles
  layout (b/408453889) we should also only enable the new flow
  on large screens where bubblebar is enabled

Fixes: 408955678
Flag: EXEMPT bugfix
Test: Launch an app into a bubble on a phone
Change-Id: I5fb898a07cbbd5a8876e0c2cb4876894ad5a8a2a
parent b7cc19dc

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

+9 −4
Original line number Diff line number Diff line
@@ -1603,10 +1603,15 @@ public class BubbleController implements ConfigurationChangeListener, 
        } else {

            b.enable(Notification.BubbleMetadata.FLAG_AUTO_EXPAND_BUBBLE);



            if (isShowingAsBubbleBar()) {

                ensureBubbleViewsAndWindowCreated();

                mBubbleTransitions.startLaunchIntoOrConvertToBubble(b, mExpandedViewManager,

                        mBubbleTaskViewFactory, mBubblePositioner, mStackView, mLayerView,

                        mBubbleIconFactory, mInflateSynchronously);

            } else {

                inflateAndAdd(b, /* suppressFlyout= */ true, /* showInShade= */ false,

                        updateLocation);

            }

        }

    }