Finish recents animation when user long swipes to all apps.

Change-Id: I4b7c419236f3a31f882d8bf5a7f526cb7310215a
Fixes: 123601356
Test: Long swipe to all apps. Release and swipe down to home. Make sure live tile is gone.
This commit is contained in:
Tracy Zhou 2019-01-29 17:10:16 -08:00
parent 989732be57
commit f13380543f
2 changed files with 10 additions and 4 deletions

View File

@ -19,6 +19,7 @@ import static com.android.launcher3.LauncherAnimUtils.MIN_PROGRESS_TO_ALL_APPS;
import static com.android.launcher3.LauncherState.ALL_APPS;
import static com.android.launcher3.LauncherState.OVERVIEW;
import static com.android.launcher3.anim.Interpolators.DEACCEL;
import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;
import static com.android.quickstep.WindowTransformSwipeHandler.MAX_SWIPE_DURATION;
import static com.android.quickstep.WindowTransformSwipeHandler.MIN_OVERSHOOT_DURATION;
@ -173,5 +174,9 @@ public class LongSwipeHelper {
0);
callback.run();
if (ENABLE_QUICKSTEP_LIVE_TILE.get() && toAllApps) {
rv.finishRecentsAnimation(true, null);
}
}
}

View File

@ -1555,7 +1555,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
mClipAnimationHelper = clipAnimationHelper;
}
public void finishRecentsAnimation(boolean toHome, Runnable onFinishComplete) {
public void finishRecentsAnimation(boolean toRecents, Runnable onFinishComplete) {
if (mRecentsAnimationWrapper == null) {
if (onFinishComplete != null) {
onFinishComplete.run();
@ -1563,10 +1563,11 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
return;
}
mRecentsAnimationWrapper.finish(toHome, onFinishComplete);
mRecentsAnimationWrapper.finish(toRecents, onFinishComplete);
}
public void takeScreenshotAndFinishRecentsAnimation(boolean toHome, Runnable onFinishComplete) {
public void takeScreenshotAndFinishRecentsAnimation(boolean toRecents,
Runnable onFinishComplete) {
if (mRecentsAnimationWrapper == null || getRunningTaskView() == null) {
if (onFinishComplete != null) {
onFinishComplete.run();
@ -1601,7 +1602,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
}
detach();
mRecentsAnimationWrapper.finish(toHome, () -> {
mRecentsAnimationWrapper.finish(toRecents, () -> {
onFinishComplete.run();
mRunningTaskId = -1;
});