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

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

Merge "Update badge visibility on expand and collapse" into sc-dev

parents 76946f28 3c10ac11

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

+2 −2
Original line number Diff line number Diff line
@@ -1665,6 +1665,7 @@ public class BubbleStackView extends FrameLayout 
        }

        beforeExpandedViewAnimation();



        updateBadgesAndZOrder(false /* setBadgeForCollapsedStack */);

        mBubbleContainer.setActiveController(mExpandedAnimationController);

        updateOverflowVisibility();

        updatePointerPosition();
@@ -1878,7 +1879,7 @@ public class BubbleStackView extends FrameLayout 
                                mExpandedBubble));

                    }

                    updateOverflowVisibility();



                    updateBadgesAndZOrder(true /* setBadgeForCollapsedStack */);

                    afterExpandedViewAnimation();

                    if (previouslySelected != null) {

                        previouslySelected.setContentVisibility(false);
@@ -2626,7 +2627,6 @@ public class BubbleStackView extends FrameLayout 
        }



        mStackOnLeftOrWillBe = mStackAnimationController.isStackOnLeftSide();

        updateBadgesAndZOrder(false /* setBadgeForCollapsedStack */);

    }



    /**