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

Merge "Adjust the physics params to values decided on in meeting w/ design." into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-05 02:42:44 +00:00
committed by Android (Google) Code Review
parent 7fddea0e29 58f7a5a78b
commit 242522bf8b
1 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,22 +57,24 @@ public class StackAnimationController extends
/** /**
* Values to use for the default {@link SpringForce} provided to the physics animation layout. * Values to use for the default {@link SpringForce} provided to the physics animation layout.
*/ */
private static final float DEFAULT_STIFFNESS = 2500f; private static final int DEFAULT_STIFFNESS = 12000;
private static final float DEFAULT_BOUNCINESS = 0.85f; private static final int FLING_FOLLOW_STIFFNESS = 20000;
private static final float DEFAULT_BOUNCINESS = 0.9f;
/** /**
* Friction applied to fling animations. Since the stack must land on one of the sides of the * Friction applied to fling animations. Since the stack must land on one of the sides of the
* screen, we want less friction horizontally so that the stack has a better chance of making it * screen, we want less friction horizontally so that the stack has a better chance of making it
* to the side without needing a spring. * to the side without needing a spring.
*/ */
private static final float FLING_FRICTION_X = 1.15f; private static final float FLING_FRICTION_X = 2.2f;
private static final float FLING_FRICTION_Y = 1.5f; private static final float FLING_FRICTION_Y = 2.2f;
/** /**
* Damping ratio to use for the stack spring animation used to spring the stack to its final * Values to use for the stack spring animation used to spring the stack to its final position
* position after a fling. * after a fling.
*/ */
private static final float SPRING_DAMPING_RATIO = 0.85f; private static final int SPRING_AFTER_FLING_STIFFNESS = 750;
private static final float SPRING_AFTER_FLING_DAMPING_RATIO = 0.85f;
/** /**
* Minimum fling velocity required to trigger moving the stack from one side of the screen to * Minimum fling velocity required to trigger moving the stack from one side of the screen to
@@ -108,6 +110,12 @@ public class StackAnimationController extends
private HashMap<DynamicAnimation.ViewProperty, DynamicAnimation> mStackPositionAnimations = private HashMap<DynamicAnimation.ViewProperty, DynamicAnimation> mStackPositionAnimations =
new HashMap<>(); new HashMap<>();
/**
* Whether the current motion of the stack is due to a fling animation (vs. being dragged
* manually).
*/
private boolean mIsMovingFromFlinging = false;
/** Horizontal offset of bubbles in the stack. */ /** Horizontal offset of bubbles in the stack. */
private float mStackOffset; private float mStackOffset;
/** Diameter of the bubbles themselves. */ /** Diameter of the bubbles themselves. */
@@ -147,6 +155,10 @@ public class StackAnimationController extends
moveFirstBubbleWithStackFollowing(DynamicAnimation.TRANSLATION_X, x); moveFirstBubbleWithStackFollowing(DynamicAnimation.TRANSLATION_X, x);
moveFirstBubbleWithStackFollowing(DynamicAnimation.TRANSLATION_Y, y); moveFirstBubbleWithStackFollowing(DynamicAnimation.TRANSLATION_Y, y);
// This method is called when the stack is being dragged manually, so we're clearly no
// longer flinging.
mIsMovingFromFlinging = false;
} }
/** /**
@@ -202,8 +214,8 @@ public class StackAnimationController extends
startXVelocity, startXVelocity,
FLING_FRICTION_X, FLING_FRICTION_X,
new SpringForce() new SpringForce()
.setStiffness(SpringForce.STIFFNESS_LOW) .setStiffness(SPRING_AFTER_FLING_STIFFNESS)
.setDampingRatio(SPRING_DAMPING_RATIO), .setDampingRatio(SPRING_AFTER_FLING_DAMPING_RATIO),
destinationRelativeX); destinationRelativeX);
flingThenSpringFirstBubbleWithStackFollowing( flingThenSpringFirstBubbleWithStackFollowing(
@@ -211,8 +223,8 @@ public class StackAnimationController extends
velY, velY,
FLING_FRICTION_Y, FLING_FRICTION_Y,
new SpringForce() new SpringForce()
.setStiffness(SpringForce.STIFFNESS_LOW) .setStiffness(SPRING_AFTER_FLING_STIFFNESS)
.setDampingRatio(SPRING_DAMPING_RATIO), .setDampingRatio(SPRING_AFTER_FLING_DAMPING_RATIO),
/* destination */ null); /* destination */ null);
mLayout.setEndActionForMultipleProperties( mLayout.setEndActionForMultipleProperties(
@@ -223,6 +235,8 @@ public class StackAnimationController extends
mLayout.removeEndActionForProperty(DynamicAnimation.TRANSLATION_Y); mLayout.removeEndActionForProperty(DynamicAnimation.TRANSLATION_Y);
}, },
DynamicAnimation.TRANSLATION_X, DynamicAnimation.TRANSLATION_Y); DynamicAnimation.TRANSLATION_X, DynamicAnimation.TRANSLATION_Y);
mIsMovingFromFlinging = true;
} }
/** /**
@@ -432,7 +446,8 @@ public class StackAnimationController extends
.setDampingRatio(BubbleController.getBubbleBounciness( .setDampingRatio(BubbleController.getBubbleBounciness(
mLayout.getContext(), DEFAULT_BOUNCINESS)) mLayout.getContext(), DEFAULT_BOUNCINESS))
.setStiffness(BubbleController.getBubbleStiffness( .setStiffness(BubbleController.getBubbleStiffness(
mLayout.getContext(), (int) DEFAULT_STIFFNESS)); mLayout.getContext(),
mIsMovingFromFlinging ? FLING_FOLLOW_STIFFNESS : DEFAULT_STIFFNESS));
} }
@Override @Override