| commit | 2207fe0fef7b532efecfd7da9eb1ea5a7f93bc2f | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Mar 22 19:56:33 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 22 19:56:33 2021 +0000 |
| tree | ef0c37432f447e271bab39437f42d54076ad7419 | |
| parent | 15a418b1f4eb9abcfad37b97e61db13d100cace3 [diff] | |
| parent | 6db6c9fe7d75447eba2099031090a5d1514bc549 [diff] |
Merge "Don't go to NORMAL after task launches if animation in progress" into sc-dev am: 6db6c9fe7d Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13930923 Change-Id: I7aaad17e2aa15a5126469858703189c5ef48fe87
diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java index e042b35..a0af68a 100644 --- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java +++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
@@ -101,7 +101,7 @@ @Override protected void onTaskLaunchAnimationEnd(boolean success) { if (success) { - mActivity.getStateManager().goToState(NORMAL, false /* animate */); + mActivity.getStateManager().moveToRestState(); } else { LauncherState state = mActivity.getStateManager().getState(); mActivity.getAllAppsController().setState(state);