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

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

@@ -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

@@ -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;
             }