| commit | c923ee1a5d4f16431aa6225cf96d6ccd3e33d7a7 | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Thu Jan 20 21:34:34 2022 +0000 |
| committer | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | Thu Jan 20 21:34:34 2022 +0000 |
| tree | 301fd909513f9cb051e3b6bc5f6f9e641f3cc3ab | |
| parent | 9815dd9c8baade5a04b23458e591aef7ebcc8172 [diff] | |
| parent | 675120232802b220c93600a391ee560742beb17c [diff] |
[automerge] Skip animation if there are no targets 2p: 6751202328 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16683595 Bug: 210118444 Change-Id: I0d551c933b0aaf6c12fcd96cd50fb0650467ca3e
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 02261af..13a2bda 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -4139,8 +4139,10 @@ anim.play(ObjectAnimator.ofFloat(getPageAt(centerTaskIndex), mOrientationHandler.getPrimaryViewTranslate(), primaryTranslation)); int runningTaskIndex = recentsView.getRunningTaskIndex(); - if (ENABLE_QUICKSTEP_LIVE_TILE.get() && runningTaskIndex != -1 - && runningTaskIndex != taskIndex) { + if (ENABLE_QUICKSTEP_LIVE_TILE.get() + && runningTaskIndex != -1 + && runningTaskIndex != taskIndex + && recentsView.getRemoteTargetHandles() != null) { for (RemoteTargetHandle remoteHandle : recentsView.getRemoteTargetHandles()) { anim.play(ObjectAnimator.ofFloat( remoteHandle.getTaskViewSimulator().taskPrimaryTranslation,