Merge "Refactor handling data launching split screen to separate class" into udc-dev
diff --git a/OWNERS b/OWNERS
index 76644b3..b684460 100644
--- a/OWNERS
+++ b/OWNERS
@@ -12,6 +12,7 @@
vadimt@google.com
winsonc@google.com
jonmiranda@google.com
+alexchau@google.com
per-file FeatureFlags.java, globs = set noparent
per-file FeatureFlags.java = sunnygoyal@google.com, winsonc@google.com, adamcohen@google.com, hyunyoungs@google.com, captaincole@google.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()) {