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

Commit 273632ff authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Only collapse the stack onTaskMovedToFront if we're not animating" into qt-r1-bubbles-dev

parents c58c17a2 047e24ec

packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java

+3 −1
Original line number Diff line number Diff line
@@ -903,9 +903,11 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 
        @Override

        public void onTaskMovedToFront(RunningTaskInfo taskInfo) {

            if (mStackView != null && taskInfo.displayId == Display.DEFAULT_DISPLAY) {

                if (!mStackView.isExpansionAnimating()) {

                    mBubbleData.setExpanded(false);

                }

            }

        }



        @Override

        public void onActivityLaunchOnSecondaryDisplayRerouted() {

packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java

+7 −0
Original line number Diff line number Diff line
@@ -662,6 +662,13 @@ public class BubbleStackView extends FrameLayout { 
        return mIsExpanded;

    }



    /**

     * Whether the stack of bubbles is animating to or from expansion.

     */

    public boolean isExpansionAnimating() {

        return mIsExpansionAnimating;

    }



    /**

     * The {@link BubbleView} that is expanded, null if one does not exist.

     */