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

Commit 242670cc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update badge visibility on expand and collapse" into sc-dev am: 028348d8 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iadae615f3b8fe4dc11ae46601cebc843683d8c60
parents a8e85e6c 028348d8

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 */);

    }



    /**