| commit | 784a6466deb2caf8e53de6d5173e8095f21899b1 | [log] [tgz] |
|---|---|---|
| author | Jon Miranda <jonmiranda@google.com> | Tue Mar 21 22:20:18 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 21 22:20:18 2023 +0000 |
| tree | 5778f1f7010888e43bc33ffd2eee4feaf4c44563 | |
| parent | bb90cfb25a4ea2318e34a8569e8e8c62844ff2a7 [diff] | |
| parent | 43102d323b3557caa1f4e7a33dd06dece95eb811 [diff] |
Merge "Fix issue where two translation animations clobber each other." into tm-qpr-dev am: 56e660c6f3 am: 43102d323b Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22167061 Change-Id: I66458f6c7da14296a71e1a9447544fa2d021a4e3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarTranslationController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarTranslationController.java index 062b4ce..dd88a37 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarTranslationController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarTranslationController.java
@@ -138,7 +138,7 @@ * Returns an animation to reset the taskbar translation to {@code 0}. */ public ObjectAnimator createAnimToResetTranslation(long duration) { - ObjectAnimator animator = ObjectAnimator.ofFloat(mTranslationYForSwipe, VALUE, 0); + ObjectAnimator animator = mTranslationYForSwipe.animateToValue(0); animator.setInterpolator(Interpolators.LINEAR); animator.setDuration(duration); animator.addListener(new AnimatorListenerAdapter() {