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

Merge "[Bouncer] Move reset logic to end event." into tm-dev am: 277f9b3b76 am: 3984cdb32d

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

Change-Id: I0ef7e0176584d98a0e9ce890545615ab3ee0df49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aaron Liu
2022-05-25 21:00:53 +00:00
committed by Automerger Merge Worker
parent df602925ec 3984cdb32d
commit 9788232ab1
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SettingsLib/src/com/android/settingslib/animation/AppearAnimationUtils.java
View File

@@ -216,22 +216,16 @@ public class AppearAnimationUtils implements AppearAnimationCreator<View> {
}); });
} }
alphaAnim.addListener(new AnimatorListenerAdapter() { alphaAnim.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationCancel(Animator animation) {
// If Animation is canceled, we want to ensure UI is reset.
view.setAlpha(targetAlpha);
view.setTranslationY(targetTranslationY);
}
@Override @Override
public void onAnimationEnd(Animator animation) { public void onAnimationEnd(Animator animation) {
view.setAlpha(targetAlpha);
if (endRunnable != null) { if (endRunnable != null) {
endRunnable.run(); endRunnable.run();
} }
} }
}); });
alphaAnim.start(); alphaAnim.start();
startTranslationYAnimation(view, delay, duration, appearing ? 0 : translationY, startTranslationYAnimation(view, delay, duration, targetTranslationY,
interpolator, animatorListener); interpolator, animatorListener);
} }
} }
@@ -265,6 +259,12 @@ public class AppearAnimationUtils implements AppearAnimationCreator<View> {
if (listener != null) { if (listener != null) {
translationAnim.addListener(listener); translationAnim.addListener(listener);
} }
translationAnim.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
view.setTranslationY(endTranslationY);
}
});
translationAnim.start(); translationAnim.start();
} }