Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't save touch location as a resting position." into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-05-21 15:38:34 +00:00
committed by Android (Google) Code Review
parent 86b5fa9c1f c81cc482dd
commit d70e938de0
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/bubbles/animation/StackAnimationController.java
View File

@@ -691,12 +691,22 @@ public class StackAnimationController extends
PhysicsAnimationLayout.getReadablePropertyName(property), PhysicsAnimationLayout.getReadablePropertyName(property),
finalPosition)); finalPosition));
// Whether we're springing towards the touch location, rather than to a position on the
// sides of the screen.
final boolean isSpringingTowardsTouch = mSpringToTouchOnNextMotionEvent;
StackPositionProperty firstBubbleProperty = new StackPositionProperty(property); StackPositionProperty firstBubbleProperty = new StackPositionProperty(property);
SpringAnimation springAnimation = SpringAnimation springAnimation =
new SpringAnimation(this, firstBubbleProperty) new SpringAnimation(this, firstBubbleProperty)
.setSpring(spring) .setSpring(spring)
.addEndListener((dynamicAnimation, b, v, v1) -> { .addEndListener((dynamicAnimation, b, v, v1) -> {
mRestingStackPosition.set(mStackPosition); if (!isSpringingTowardsTouch) {
// If we're springing towards the touch position, don't save the
// resting position - the touch location is not a valid resting
// position. We'll set this when the stack springs to the left or
// right side of the screen after the touch gesture ends.
mRestingStackPosition.set(mStackPosition);
}
if (after != null) { if (after != null) {
for (Runnable callback : after) { for (Runnable callback : after) {