Merge "Don't animate in the bubble bar unless there are bubbles" into udc-qpr-dev

This commit is contained in:
Liran Binyamin authored and Android (Google) Code Review committed 2023-07-28 19:54:29 +00:00
commit 5c936d6246
2 files changed
+4 -5

No files matched your search

@@ -362,10 +362,9 @@ public class BubbleBarController extends IBubblesListener.Stub {
}
if (bubbleToSelect != null) {
setSelectedBubble(bubbleToSelect);
}
if (previouslySelectedBubble == null) {
mBubbleStashController.animateToInitialState(update.expanded);
if (previouslySelectedBubble == null) {
mBubbleStashController.animateToInitialState(update.expanded);
}
}
if (update.expandedChanged) {
@@ -201,7 +201,7 @@ public class BubbleStashController {
public void onSysuiLockedStateChange(boolean isSysuiLocked) {
if (isSysuiLocked != mIsSysuiLocked) {
mIsSysuiLocked = isSysuiLocked;
if (!mIsSysuiLocked) {
if (!mIsSysuiLocked && mBarViewController.hasBubbles()) {
animateToInitialState(false /* expanding */);
}
}