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

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

Merge "Check that the bubble bar has bubbles before showing it" into udc-qpr-dev

parents 735b18ba 1d7494b4

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

+5 −0
Original line number Diff line number Diff line
@@ -145,6 +145,11 @@ public class BubbleBarViewController { 
        return mBarView.getVisibility() == VISIBLE;

    }



    /** Whether the bubble bar has bubbles. */

    public boolean hasBubbles() {

        return mBubbleBarController.getSelectedBubbleKey() != null;

    }



    /**

     * The bounds of the bubble bar.

     */

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

+2 −2
Original line number Diff line number Diff line
@@ -126,8 +126,8 @@ public class BubbleStashController { 
        if (mBubblesShowingOnHome != onHome) {

            mBubblesShowingOnHome = onHome;



            if (!mBarViewController.isBubbleBarVisible()) {

                // if the bubble bar is not visible, there are no bubbles, so just return.

            if (!mBarViewController.hasBubbles()) {

                // if there are no bubbles, there's nothing to show, so just return.

                return;

            }