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

Commit 08bb6f8b authored by Lyn Han's avatar Lyn Han Committed by Automerger Merge Worker
Browse files

Merge "Reorder bubbles without animations on collapse" into sc-dev am: 26e6b76d 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6989ec6fdc8c8f18b8e5c157c5898d0e898d05b
parents 6ab712c4 26e6b76d

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

+2 −5
Original line number Diff line number Diff line
@@ -1539,19 +1539,16 @@ public class BubbleStackView extends FrameLayout 
     * Update bubble order and pointer position.

     */

    public void updateBubbleOrder(List<Bubble> bubbles) {

        if (isExpansionAnimating()) {

            return;

        }

        final Runnable reorder = () -> {

            for (int i = 0; i < bubbles.size(); i++) {

                Bubble bubble = bubbles.get(i);

                mBubbleContainer.reorderView(bubble.getIconView(), i);

            }

        };

        if (mIsExpanded) {

        if (mIsExpanded || isExpansionAnimating()) {

            reorder.run();

            updateBadgesAndZOrder(false /* setBadgeForCollapsedStack */);

        } else {

        } else if (!isExpansionAnimating()) {

            List<View> bubbleViews = bubbles.stream()

                    .map(b -> b.getIconView()).collect(Collectors.toList());

            mStackAnimationController.animateReorder(bubbleViews, reorder);