commit 7c472b6ea06744391b91adf572fb4a34a75f93a1
author Sunny Goyal <sunnygoyal@google.com> Fri Apr 08 07:56:47 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Apr 08 07:56:47 2022 +0000
tree 11758e21ae1ad596d1b8f2e4cb6a2b00e36efb94
parent 2f83e94c88b501755d9c6de32c4d37f0f18677c9
parent 1eb11401296e9253655234420bbdd6eeb5c607f1

Merge "Fixing spring animation for fallback launcher activity" into tm-dev am: 1eb1140129

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17626829

Change-Id: Ib89404b7b7ecd2d82b5829cf53b80a6d2defdba6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

quickstep/src/com/android/quickstep/FallbackSwipeHandler.java

diff --git a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
index 0689642..9828467 100644
--- a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
+++ b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java
@@ -263,15 +263,13 @@
             } else {
                 mHomeAlpha = new AnimatedFloat(this::updateHomeAlpha);
                 mHomeAlpha.value = 0;
-                runActionOnRemoteHandles(remoteTargetHandle ->
-                        remoteTargetHandle.getTransformParams().setHomeBuilderProxy(
-                                FallbackHomeAnimationFactory.this
-                                        ::updateHomeActivityTransformDuringHomeAnim));
+                mHomeAlphaParams.setHomeBuilderProxy(
+                        this::updateHomeActivityTransformDuringHomeAnim);
             }
 
             mRecentsAlpha.value = 1;
             runActionOnRemoteHandles(remoteTargetHandle ->
-                    remoteTargetHandle.getTransformParams().setHomeBuilderProxy(
+                    remoteTargetHandle.getTransformParams().setBaseBuilderProxy(
                             FallbackHomeAnimationFactory.this
                                     ::updateRecentsActivityTransformDuringHomeAnim));
         }