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

Commit 630355d2 authored by Winson Chung's avatar Winson Chung
Browse files

Skip bubble transition when bubble bar is not showing 

- This is temporary until bubble transitions are updated to support
  both stack and layer views

Fixes: 408955678
Bug: 408453889
Flag: EXEMPT bugfix
Test: On phones only, bubble something that has a trampoline activity
Change-Id: I8fecd0aa4180841d1c084fbfe779caba1a239689
parent f5835117

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.

     */

libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java

+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