Merge "Fix an issue where tasks moving to front would collapse the stack." into tm-dev
This commit is contained in:
@@ -2220,11 +2220,10 @@ public class BubbleStackView extends FrameLayout
|
|||||||
private void animateSwitchBubbles() {
|
private void animateSwitchBubbles() {
|
||||||
// If we're no longer expanded, this is meaningless.
|
// If we're no longer expanded, this is meaningless.
|
||||||
if (!mIsExpanded) {
|
if (!mIsExpanded) {
|
||||||
|
mIsBubbleSwitchAnimating = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
mIsBubbleSwitchAnimating = true;
|
|
||||||
|
|
||||||
// The surface contains a screenshot of the animating out bubble, so we just need to animate
|
// The surface contains a screenshot of the animating out bubble, so we just need to animate
|
||||||
// it out (and then release the GraphicBuffer).
|
// it out (and then release the GraphicBuffer).
|
||||||
PhysicsAnimator.getInstance(mAnimatingOutSurfaceContainer).cancel();
|
PhysicsAnimator.getInstance(mAnimatingOutSurfaceContainer).cancel();
|
||||||
@@ -2838,6 +2837,7 @@ public class BubbleStackView extends FrameLayout
|
|||||||
}, 0);
|
}, 0);
|
||||||
|
|
||||||
if (!mIsExpansionAnimating) {
|
if (!mIsExpansionAnimating) {
|
||||||
|
mIsBubbleSwitchAnimating = true;
|
||||||
mSurfaceSynchronizer.syncSurfaceAndRun(() -> {
|
mSurfaceSynchronizer.syncSurfaceAndRun(() -> {
|
||||||
post(this::animateSwitchBubbles);
|
post(this::animateSwitchBubbles);
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user