openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Fixing state not set properly when configuration changes and remote animation callback comes after threshold is crossed" into ub-launcher3-master

This commit is contained in:
TreeHugger Robot 2018-10-19 18:08:42 +00:00 committed by Android (Google) Code Review
parent 6e11a2d9f2 ba7dba3983
commit 30dfe8add3
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
View File

@ -540,7 +540,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> {
public void updateDisplacement(float displacement) { public void updateDisplacement(float displacement) {
// We are moving in the negative x/y direction // We are moving in the negative x/y direction
displacement = -displacement; displacement = -displacement;
if (displacement > mTransitionDragLength) { if (displacement > mTransitionDragLength && mTransitionDragLength > 0) {
mCurrentShift.updateValue(1); mCurrentShift.updateValue(1);
if (!mBgLongSwipeMode) { if (!mBgLongSwipeMode) {
@ -815,8 +815,12 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> {
long startMillis = SystemClock.uptimeMillis(); long startMillis = SystemClock.uptimeMillis();
executeOnUiThread(() -> { executeOnUiThread(() -> {
// Animate the launcher components at the same time as the window, always on UI thread. // Animate the launcher components at the same time as the window, always on UI thread.
if (mLauncherTransitionController != null && !mWasLauncherAlreadyVisible if (mLauncherTransitionController == null) {
&& start != end && duration > 0) { return;
}
if (start == end || duration <= 0) {
mLauncherTransitionController.getAnimationPlayer().end();
} else {
// Adjust start progress and duration in case we are on a different thread. // Adjust start progress and duration in case we are on a different thread.
long elapsedMillis = SystemClock.uptimeMillis() - startMillis; long elapsedMillis = SystemClock.uptimeMillis() - startMillis;
elapsedMillis = Utilities.boundToRange(elapsedMillis, 0, duration); elapsedMillis = Utilities.boundToRange(elapsedMillis, 0, duration);