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

Merge "Clamp start delay to non-negative range" into nyc-dev

Browse Source
This commit is contained in:
Doris Liu
2016-05-25 01:41:11 +00:00
committed by Android (Google) Code Review
parent ba2cc82399 61045c518b
commit 54d89e078d
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/animation/AnimatorSet.java
View File

@@ -465,20 +465,26 @@ public final class AnimatorSet extends Animator {
/** /**
* The amount of time, in milliseconds, to delay starting the animation after * The amount of time, in milliseconds, to delay starting the animation after
* {@link #start()} is called. * {@link #start()} is called. Note that the start delay should always be non-negative. Any
* negative start delay will be clamped to 0 on N and above.
*
* @param startDelay The amount of the delay, in milliseconds * @param startDelay The amount of the delay, in milliseconds
*/ */
@Override @Override
public void setStartDelay(long startDelay) { public void setStartDelay(long startDelay) {
if (mStartDelay > 0) { // Clamp start delay to non-negative range.
mReversible = false; if (startDelay < 0) {
Log.w(TAG, "Start delay should always be non-negative");
startDelay = 0;
} }
long delta = startDelay - mStartDelay; long delta = startDelay - mStartDelay;
if (delta == 0) { if (delta == 0) {
return; return;
} }
mStartDelay = startDelay; mStartDelay = startDelay;
if (mStartDelay > 0) {
mReversible = false;
}
if (!mDependencyDirty) { if (!mDependencyDirty) {
// Dependency graph already constructed, update all the nodes' start/end time // Dependency graph already constructed, update all the nodes' start/end time
int size = mNodes.size(); int size = mNodes.size();

10
core/java/android/animation/ValueAnimator.java
View File

@@ -708,12 +708,18 @@ public class ValueAnimator extends Animator implements AnimationHandler.Animatio
/** /**
* The amount of time, in milliseconds, to delay starting the animation after * The amount of time, in milliseconds, to delay starting the animation after
* {@link #start()} is called. * {@link #start()} is called. Note that the start delay should always be non-negative. Any
* negative start delay will be clamped to 0 on N and above.
*
* @param startDelay The amount of the delay, in milliseconds * @param startDelay The amount of the delay, in milliseconds
*/ */
@Override @Override
public void setStartDelay(long startDelay) { public void setStartDelay(long startDelay) {
// Clamp start delay to non-negative range.
if (startDelay < 0) {
Log.w(TAG, "Start delay should always be non-negative");
startDelay = 0;
}
mStartDelay = startDelay; mStartDelay = startDelay;
} }