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

Merge "Merge "Clamp start delay to non-negative range" into nyc-dev am: 54d89e078d" into nyc-dev-plus-aosp

Browse Source 
am: b2f00b93b0

* commit 'b2f00b93b07572c894a2a9f200580cd21aa61ffb':
  Clamp start delay to non-negative range

Change-Id: Ib1d1ea890544f1ecfb30abc80ecc1c156834b3d0
This commit is contained in:
Doris Liu
2016-05-25 01:52:15 +00:00
committed by android-build-merger
parent 7691bcfb63 b2f00b93b0
commit b84f6538a8
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
* {@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
*/
@Override
public void setStartDelay(long startDelay) {
if (mStartDelay > 0) {
mReversible = false;
// Clamp start delay to non-negative range.
if (startDelay < 0) {
Log.w(TAG, "Start delay should always be non-negative");
startDelay = 0;
}
long delta = startDelay - mStartDelay;
if (delta == 0) {
return;
}
mStartDelay = startDelay;
if (mStartDelay > 0) {
mReversible = false;
}
if (!mDependencyDirty) {
// Dependency graph already constructed, update all the nodes' start/end time
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
* {@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
*/
@Override
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;
}