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

Commit 6a4f057c authored by Mady Mellor's avatar Mady Mellor Committed by Android (Google) Code Review
Browse files

Merge "Only reorder bubbles if the position is different" into main

parents be42f503 adb6d81b

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

+1 −0
Original line number Diff line number Diff line
@@ -1025,6 +1025,7 @@ public class BubbleStackView extends FrameLayout 
                            WindowManager.class)));

                    onDisplaySizeChanged();

                    mExpandedAnimationController.updateResources();

                    mExpandedAnimationController.onOrientationChanged();

                    mStackAnimationController.updateResources();

                    mBubbleOverflow.updateResources();

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

+8 −0
Original line number Diff line number Diff line
@@ -614,6 +614,14 @@ public class ExpandedAnimationController 
        }

    }



    /**

     * Call to update the bubble positions after an orientation change.

     */

    public void onOrientationChanged() {

        if (mLayout == null) return;

        updateBubblePositions();

    }



    private void updateBubblePositions() {

        if (mAnimatingExpand || mAnimatingCollapse) {

            return;

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

+2 −0
Original line number Diff line number Diff line
@@ -378,6 +378,8 @@ public class PhysicsAnimationLayout extends FrameLayout { 
        }

        final int oldIndex = indexOfChild(view);



        if (oldIndex == index) return;



        super.removeView(view);

        if (view.getParent() != null) {

            // View still has a parent. This could have been added as a transient view.