Merge "Only animate bubbles when in app" into main
diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java
index a1a2898..0e62eaf 100644
--- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java
@@ -371,10 +371,9 @@
return;
}
- boolean isStashedOrGone =
- mBubbleStashController.isStashed() || mBarView.getVisibility() != VISIBLE;
- // don't animate the new bubble if we're auto expanding from stashed
- if (b instanceof BubbleBarBubble && isStashedOrGone && !isExpanding) {
+ boolean isInApp = mTaskbarStashController.isInApp();
+ // only animate the new bubble if we're in an app and not auto expanding
+ if (b instanceof BubbleBarBubble && isInApp && !isExpanding) {
mBubbleBarViewAnimator.animateBubbleInForStashed((BubbleBarBubble) b);
}
} else {