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

Merge "Fix pause/resume for AnimatorSet" into nyc-dev

Browse Source 
am: dd67b0d

* commit 'dd67b0d52521bb828bc31732fe3ac8b786a19cce':
  Fix pause/resume for AnimatorSet

Change-Id: Ia723c49840910cb45d4cb5f03963d86cca53e896
This commit is contained in:
Doris Liu
2016-04-19 22:24:22 +00:00
committed by android-build-merger
parent 10cfe40280 dd67b0d525
commit 6690504457
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

@@ -559,7 +559,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();
@@ -578,7 +579,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();