| commit | b118667290ee9b55790e63603be11b5f9348d9d4 | [log] [tgz] |
|---|---|---|
| author | Vinit Nayak <peanutbutter@google.com> | Thu Aug 26 06:07:50 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 26 06:07:50 2021 +0000 |
| tree | bf85fd14ac429c9113f785de2547822191466202 | |
| parent | 6c3530c6d71b05194864173880ec7441a95773aa [diff] | |
| parent | 759e15fe45c88079e5932a1043ebac3c817d74ab [diff] |
Merge "Null out RemoteTargetHandles as soon as finishing recents is requested" into sc-v2-dev am: 759e15fe45 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15661931 Change-Id: I31ed76ec3ea6394ddd42a4530d1e1c8635e52b0a
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index ad41321..5974677 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -4090,6 +4090,8 @@ public void finishRecentsAnimation(boolean toRecents, boolean shouldPip, Runnable onFinishComplete) { + // TODO(b/197232424#comment#10) Move this back into onRecentsAnimationComplete(). Maybe? + mRemoteTargetHandles = null; if (!toRecents && ENABLE_QUICKSTEP_LIVE_TILE.get()) { // Reset the minimized state since we force-toggled the minimized state when entering // overview, but never actually finished the recents animation. This is a catch all for @@ -4137,7 +4139,6 @@ setCurrentTask(-1); mRecentsAnimationController = null; executeSideTaskLaunchCallback(); - mRemoteTargetHandles = null; } public void setDisallowScrollToClearAll(boolean disallowScrollToClearAll) {