diff options
| author | Justin Klaassen <justinklaassen@google.com> | 2017-10-10 15:20:13 -0400 |
|---|---|---|
| committer | Justin Klaassen <justinklaassen@google.com> | 2017-10-10 15:20:13 -0400 |
| commit | 93b7ee4fce01df52a6607f0b1965cbafdfeaf1a6 (patch) | |
| tree | 49f76f879a89c256a4f65b674086be50760bdffb /android/animation | |
| parent | bc81c7ada5aab3806dd0b17498f5c9672c9b33c4 (diff) | |
| download | android-28-93b7ee4fce01df52a6607f0b1965cbafdfeaf1a6.tar.gz | |
Import Android SDK Platform P [4386628]
/google/data/ro/projects/android/fetch_artifact \
--bid 4386628 \
--target sdk_phone_armv7-win_sdk \
sdk-repo-linux-sources-4386628.zip
AndroidVersion.ApiLevel has been modified to appear as 28
Change-Id: I9b8400ac92116cae4f033d173f7a5682b26ccba9
Diffstat (limited to 'android/animation')
| -rw-r--r-- | android/animation/AnimatorSet.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/android/animation/AnimatorSet.java b/android/animation/AnimatorSet.java index 00d6657e..1a2dc5cd 100644 --- a/android/animation/AnimatorSet.java +++ b/android/animation/AnimatorSet.java @@ -843,7 +843,7 @@ public final class AnimatorSet extends Animator implements AnimationHandler.Anim // Assumes forward playing from here on. for (int i = 0; i < mEvents.size(); i++) { AnimationEvent event = mEvents.get(i); - if (event.getTime() > currentPlayTime) { + if (event.getTime() > currentPlayTime || event.getTime() == DURATION_INFINITE) { break; } @@ -1264,7 +1264,8 @@ public final class AnimatorSet extends Animator implements AnimationHandler.Anim } else { for (int i = mLastEventId + 1; i < size; i++) { AnimationEvent event = mEvents.get(i); - if (event.getTime() <= currentPlayTime) { + // TODO: need a function that accounts for infinite duration to compare time + if (event.getTime() != DURATION_INFINITE && event.getTime() <= currentPlayTime) { latestId = i; } } |