Merge changes from topic "presubmit-am-eb42a70960e740e988dfbddc552edcae" into sc-v2-dev-plus-aosp

* changes:
  [automerge] Skip animation if there are no targets 2p: 6751202328
  Skip animation if there are no targets
This commit is contained in:
Winson Chung
2022-01-21 20:04:04 +00:00
committed by Android (Google) Code Review

View File

@@ -4139,8 +4139,10 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
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,