mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-02-20 19:38:21 +00:00
Merge changes I74b09220,Id7e2db5f into main
* changes: Don't animate bubbles in the initial state update Suppress animation for bubbles that auto expand
This commit is contained in:
committed by
Android (Google) Code Review
commit
9a9ef494ae
@@ -241,7 +241,8 @@ public class BubbleBarController extends IBubblesListener.Stub {
|
||||
// we're on the main executor now, so check that the overflow hasn't been created
|
||||
// again to avoid races.
|
||||
if (mOverflowBubble == null) {
|
||||
mBubbleBarViewController.addBubble(overflow);
|
||||
mBubbleBarViewController.addBubble(
|
||||
overflow, /* isExpanding= */ false, /* suppressAnimation= */ true);
|
||||
mOverflowBubble = overflow;
|
||||
}
|
||||
});
|
||||
@@ -310,6 +311,10 @@ public class BubbleBarController extends IBubblesListener.Stub {
|
||||
private void applyViewChanges(BubbleBarViewUpdate update) {
|
||||
final boolean isCollapsed = (update.expandedChanged && !update.expanded)
|
||||
|| (!update.expandedChanged && !mBubbleBarViewController.isExpanded());
|
||||
final boolean isExpanding = update.expandedChanged && update.expanded;
|
||||
// don't animate bubbles if this is the initial state because we may be unfolding or
|
||||
// enabling gesture nav
|
||||
final boolean suppressAnimation = update.initialState;
|
||||
BubbleBarItem previouslySelectedBubble = mSelectedBubble;
|
||||
BubbleBarBubble bubbleToSelect = null;
|
||||
if (!update.removedBubbles.isEmpty()) {
|
||||
@@ -326,7 +331,7 @@ public class BubbleBarController extends IBubblesListener.Stub {
|
||||
}
|
||||
if (update.addedBubble != null) {
|
||||
mBubbles.put(update.addedBubble.getKey(), update.addedBubble);
|
||||
mBubbleBarViewController.addBubble(update.addedBubble);
|
||||
mBubbleBarViewController.addBubble(update.addedBubble, isExpanding, suppressAnimation);
|
||||
if (isCollapsed) {
|
||||
// If we're collapsed, the most recently added bubble will be selected.
|
||||
bubbleToSelect = update.addedBubble;
|
||||
@@ -339,7 +344,7 @@ public class BubbleBarController extends IBubblesListener.Stub {
|
||||
BubbleBarBubble bubble = update.currentBubbles.get(i);
|
||||
if (bubble != null) {
|
||||
mBubbles.put(bubble.getKey(), bubble);
|
||||
mBubbleBarViewController.addBubble(bubble);
|
||||
mBubbleBarViewController.addBubble(bubble, isExpanding, suppressAnimation);
|
||||
if (isCollapsed) {
|
||||
// If we're collapsed, the most recently added bubble will be selected.
|
||||
bubbleToSelect = bubble;
|
||||
|
||||
Reference in New Issue
Block a user