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

Commit 5c936d62 authored by Liran Binyamin's avatar Liran Binyamin Committed by Android (Google) Code Review
Browse files

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

parents 6702ed1e 95d84f5e

quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java

+3 −4
Original line number Diff line number Diff line
@@ -362,11 +362,10 @@ public class BubbleBarController extends IBubblesListener.Stub { 
        }

        if (bubbleToSelect != null) {

            setSelectedBubble(bubbleToSelect);

        }



            if (previouslySelectedBubble == null) {

                mBubbleStashController.animateToInitialState(update.expanded);

            }

        }



        if (update.expandedChanged) {

            if (update.expanded != mBubbleBarViewController.isExpanded()) {

quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleStashController.java

+1 −1
Original line number Diff line number Diff line
@@ -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 */);

            }

        }