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

Merge "Update language to comply with Android's inclusive language guidance"

Browse Source
This commit is contained in:
Lais Andrade
2020-07-31 14:07:06 +00:00
committed by Gerrit Code Review
parent cb51202601 e89e18b7a2
commit 5db2bcffdf
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
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 mDummyListener = new AnimatorListenerAdapter() { private AnimatorListenerAdapter mAnimationEndingListener = 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() {
addDummyListener(); addAnimationEndingListener();
// 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 addDummyListener() { private void addAnimationEndingListener() {
for (int i = 1; i < mNodes.size(); i++) { for (int i = 1; i < mNodes.size(); i++) {
mNodes.get(i).mAnimation.addListener(mDummyListener); mNodes.get(i).mAnimation.addListener(mAnimationEndingListener);
} }
} }
private void removeDummyListener() { private void removeAnimationEndingListener() {
for (int i = 1; i < mNodes.size(); i++) { for (int i = 1; i < mNodes.size(); i++) {
mNodes.get(i).mAnimation.removeListener(mDummyListener); mNodes.get(i).mAnimation.removeListener(mAnimationEndingListener);
} }
} }
@@ -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);
} }
} }
removeDummyListener(); removeAnimationEndingListener();
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.mDummyListener = new AnimatorListenerAdapter() { anim.mAnimationEndingListener = 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(mDummyListener); nodeClone.mAnimation.removeListener(mAnimationEndingListener);
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);
@@ -2087,7 +2087,7 @@ public final class AnimatorSet extends Animator implements AnimationHandler.Anim
* animation starts. * animation starts.
*/ */
public Builder after(long delay) { public Builder after(long delay) {
// setup dummy ValueAnimator just to run the clock // setup a ValueAnimator just to run the clock
ValueAnimator anim = ValueAnimator.ofFloat(0f, 1f); ValueAnimator anim = ValueAnimator.ofFloat(0f, 1f);
anim.setDuration(delay); anim.setDuration(delay);
after(anim); after(anim);