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

Commit e0388cc0 authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

Merge changes I6129aff7,I7e21ee87 into sc-dev am: 91ffe299 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14804793

Change-Id: Id021e3024d95466f9a6a93d45c9615d8a2c85c65
parents 0d13cd55 91ffe299

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

+2 −1
Original line number Diff line number Diff line
@@ -231,7 +231,8 @@ public class BubbleFlyoutView extends FrameLayout { 
     * Fade animation for consecutive flyouts.

     */

    void animateUpdate(Bubble.FlyoutMessage flyoutMessage, float parentWidth, PointF stackPos,

            boolean hideDot) {

            boolean hideDot, Runnable onHide) {

        mOnHide = onHide;

        final Runnable afterFadeOut = () -> {

            updateFlyoutMessage(flyoutMessage, parentWidth);

            // Wait for TextViews to layout with updated height.

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

+10 −9
Original line number Diff line number Diff line
@@ -1492,22 +1492,22 @@ public class BubbleStackView extends FrameLayout 
            mStackAnimationController.setStackPosition(mPositioner.getDefaultStartPosition());

        }



        if (getBubbleCount() == 0) {

            mStackOnLeftOrWillBe = mStackAnimationController.isStackOnLeftSide();

        }



        if (bubble.getIconView() == null) {

            return;

        }



        mBubbleContainer.addView(bubble.getIconView(), 0,

                new FrameLayout.LayoutParams(mPositioner.getBubbleSize(),

                        mPositioner.getBubbleSize()));



        if (getBubbleCount() == 0) {

            mStackOnLeftOrWillBe = mStackAnimationController.isStackOnLeftSide();

        }

        // Set the dot position to the opposite of the side the stack is resting on, since the stack

        // resting slightly off-screen would result in the dot also being off-screen.

        bubble.getIconView().setDotBadgeOnLeft(!mStackOnLeftOrWillBe /* onLeft */);

        bubble.getIconView().setOnClickListener(mBubbleClickListener);

        bubble.getIconView().setOnTouchListener(mBubbleTouchListener);

        mBubbleContainer.addView(bubble.getIconView(), 0,

                new FrameLayout.LayoutParams(mPositioner.getBubbleSize(),

                        mPositioner.getBubbleSize()));

        updateBubbleShadows(false /* showForAllBubbles */);

        animateInFlyoutForBubble(bubble);

        requestUpdate();
@@ -2400,7 +2400,8 @@ public class BubbleStackView extends FrameLayout 


            if (mFlyout.getVisibility() == View.VISIBLE) {

                mFlyout.animateUpdate(bubble.getFlyoutMessage(), getWidth(),

                        mStackAnimationController.getStackPosition(), !bubble.showDot());

                        mStackAnimationController.getStackPosition(), !bubble.showDot(),

                        mAfterFlyoutHidden /* onHide */);

            } else {

                mFlyout.setVisibility(INVISIBLE);

                mFlyout.setupFlyoutStartingAsDot(bubble.getFlyoutMessage(),
@@ -2408,7 +2409,7 @@ public class BubbleStackView extends FrameLayout 
                        mStackAnimationController.isStackOnLeftSide(),

                        bubble.getIconView().getDotColor() /* dotColor */,

                        expandFlyoutAfterDelay /* onLayoutComplete */,

                        mAfterFlyoutHidden,

                        mAfterFlyoutHidden /* onHide */,

                        bubble.getIconView().getDotCenter(),

                        !bubble.showDot(),

                        mPositioner);

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

+0 −3
Original line number Diff line number Diff line
@@ -124,9 +124,6 @@ public class StackAnimationController extends 
     */

    private Rect mAnimatingToBounds = new Rect();



    /** Initial starting location for the stack. */

    @Nullable private BubbleStackView.RelativeStackPosition mStackStartPosition;



    /** Whether or not the stack's start position has been set. */

    private boolean mStackMovedToStartPosition = false;