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

Merge "Change variable name fix from 'endingListener' to 'endListener'" am: af1750e973 am: d54498fb88

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386076

Change-Id: Id09f9faa6cb0615f5adfc4512079ff7e3c2d3768
This commit is contained in:
Lais Andrade
2020-08-03 18:39:47 +00:00
committed by Automerger Merge Worker
parent 63ed9937f0 d54498fb88
commit e6d76eb39d
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -183,7 +183,7 @@ public final class AnimatorSet extends Animator implements AnimationHandler.Anim
// This is to work around a bug in b/34736819. This needs to be removed once app team // This is to work around a bug in b/34736819. This needs to be removed once app team
// fixes their side. // fixes their side.
private AnimatorListenerAdapter mAnimationEndingListener = new AnimatorListenerAdapter() { private AnimatorListenerAdapter mAnimationEndListener = new AnimatorListenerAdapter() {
@Override @Override
public void onAnimationEnd(Animator animation) { public void onAnimationEnd(Animator animation) {
if (mNodeMap.get(animation) == null) { if (mNodeMap.get(animation) == null) {
@@ -1186,7 +1186,7 @@ public final class AnimatorSet extends Animator implements AnimationHandler.Anim
} }
private void startAnimation() { private void startAnimation() {
addAnimationEndingListener(); addAnimationEndListener();
// Register animation callback // Register animation callback
addAnimationCallback(0); addAnimationCallback(0);
@@ -1243,15 +1243,15 @@ public final class AnimatorSet extends Animator implements AnimationHandler.Anim
// This is to work around the issue in b/34736819, as the old behavior in AnimatorSet had // This is to work around the issue in b/34736819, as the old behavior in AnimatorSet had
// masked a real bug in play movies. TODO: remove this and below once the root cause is fixed. // masked a real bug in play movies. TODO: remove this and below once the root cause is fixed.
private void addAnimationEndingListener() { private void addAnimationEndListener() {
for (int i = 1; i < mNodes.size(); i++) { for (int i = 1; i < mNodes.size(); i++) {
mNodes.get(i).mAnimation.addListener(mAnimationEndingListener); mNodes.get(i).mAnimation.addListener(mAnimationEndListener);
} }
} }
private void removeAnimationEndingListener() { private void removeAnimationEndListener() {
for (int i = 1; i < mNodes.size(); i++) { for (int i = 1; i < mNodes.size(); i++) {
mNodes.get(i).mAnimation.removeListener(mAnimationEndingListener); mNodes.get(i).mAnimation.removeListener(mAnimationEndListener);
} }
} }
@@ -1301,7 +1301,7 @@ public final class AnimatorSet extends Animator implements AnimationHandler.Anim
tmpListeners.get(i).onAnimationEnd(this, mReversing); tmpListeners.get(i).onAnimationEnd(this, mReversing);
} }
} }
removeAnimationEndingListener(); removeAnimationEndListener();
mSelfPulse = true; mSelfPulse = true;
mReversing = false; mReversing = false;
} }
@@ -1346,7 +1346,7 @@ public final class AnimatorSet extends Animator implements AnimationHandler.Anim
anim.mNodeMap = new ArrayMap<Animator, Node>(); anim.mNodeMap = new ArrayMap<Animator, Node>();
anim.mNodes = new ArrayList<Node>(nodeCount); anim.mNodes = new ArrayList<Node>(nodeCount);
anim.mEvents = new ArrayList<AnimationEvent>(); anim.mEvents = new ArrayList<AnimationEvent>();
anim.mAnimationEndingListener = new AnimatorListenerAdapter() { anim.mAnimationEndListener = new AnimatorListenerAdapter() {
@Override @Override
public void onAnimationEnd(Animator animation) { public void onAnimationEnd(Animator animation) {
if (anim.mNodeMap.get(animation) == null) { if (anim.mNodeMap.get(animation) == null) {
@@ -1369,7 +1369,7 @@ public final class AnimatorSet extends Animator implements AnimationHandler.Anim
final Node node = mNodes.get(n); final Node node = mNodes.get(n);
Node nodeClone = node.clone(); Node nodeClone = node.clone();
// Remove the old internal listener from the cloned child // Remove the old internal listener from the cloned child
nodeClone.mAnimation.removeListener(mAnimationEndingListener); nodeClone.mAnimation.removeListener(mAnimationEndListener);
clonesMap.put(node, nodeClone); clonesMap.put(node, nodeClone);
anim.mNodes.add(nodeClone); anim.mNodes.add(nodeClone);
anim.mNodeMap.put(nodeClone.mAnimation, nodeClone); anim.mNodeMap.put(nodeClone.mAnimation, nodeClone);