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

This commit is contained in:
TreeHugger Robot
2021-02-05 20:30:51 +00:00
committed by Android (Google) Code Review

View File

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