Merge "Don't animate in the bubble bar unless there are bubbles" into udc-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
5c936d6246
@@ -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 */);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user