| commit | 92d66a4d2a0795308cbe7d15ecc41588e3b434c9 | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Fri Jan 21 20:33:38 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 21 20:33:38 2022 +0000 |
| tree | e5540ef107977cba96f6a162379f26c35ca49e7e | |
| parent | 987b62eca55ed61594e458e376d2def372e916c1 [diff] | |
| parent | 4f9711c182ea73a14027f88dc1a14bbfea68bc6d [diff] |
Merge changes from topic "presubmit-am-eb42a70960e740e988dfbddc552edcae" into sc-v2-dev-plus-aosp am: 4f9711c182 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16683595 Change-Id: Iaa54adbb00484f99272212781bdedd84a1d8ecfc
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,