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

Fix pause/resume for AnimatorSet

Browse Source 
Bug: 28251945
Change-Id: Ie98c779791bf181e2e8fbf38bbd453228ce43310
This commit is contained in:
Doris Liu
2016-04-18 17:31:24 -07:00
parent d049837397
commit 2987dffb72
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -538,7 +538,8 @@ public final class AnimatorSet extends Animator {
boolean previouslyPaused = mPaused;
super.pause();
if (!previouslyPaused && mPaused) {
if (mDelayAnim != null) {
if (mDelayAnim.isStarted()) {
// If delay hasn't passed, pause the start delay animator.
mDelayAnim.pause();
} else {
int size = mNodes.size();
@@ -557,7 +558,8 @@ public final class AnimatorSet extends Animator {
boolean previouslyPaused = mPaused;
super.resume();
if (previouslyPaused && !mPaused) {
if (mDelayAnim != null) {
if (mDelayAnim.isStarted()) {
// If start delay hasn't passed, resume the previously paused start delay animator
mDelayAnim.resume();
} else {
int size = mNodes.size();