| commit | 38780381a115a579746445f87822dd1710f77ec7 | [log] [tgz] |
|---|---|---|
| author | Sebastián Franco <fransebas@google.com> | Sat Apr 29 03:16:27 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Apr 29 03:16:27 2023 +0000 |
| tree | 651c2287ef09f005021e81cea7bd1de41261607e | |
| parent | e829350f65028007baad8e5b835b28d32a06e113 [diff] | |
| parent | c9cc7ea612e8d8b3541904856a31e882e8839329 [diff] |
Merge "Set start time for open folder animation before starting the animation" into udc-dev am: c9cc7ea612 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22872668 Change-Id: I5aa63985270d5df415ff070c0a3a9269c8261ad3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java index c9fe745..3c31b7a 100644 --- a/src/com/android/launcher3/folder/Folder.java +++ b/src/com/android/launcher3/folder/Folder.java
@@ -733,10 +733,11 @@ } mPageIndicator.stopAllAnimations(); - startAnimation(anim); + // Because t=0 has the folder match the folder icon, we can skip the // first frame and have the same movement one frame earlier. anim.setCurrentPlayTime(Math.min(getSingleFrameMs(getContext()), anim.getTotalDuration())); + startAnimation(anim); // Make sure the folder picks up the last drag move even if the finger doesn't move. if (mDragController.isDragging()) {