commit a2c965726ea21ba45b49321f31f190d1ad0a155b
author Saumya Prakash <saumyaprakash@google.com> Sat Sep 02 00:48:43 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Sep 02 00:48:43 2023 +0000
tree ae4eb3f2f39e9c8535d7e9969567922792025795
parent aee84be4b6e8cb80b927a04f6195aacb542badff
parent 15b0c9ea54fa38733704520c7e3e7bdafab1b99b

Merge "Ensure Gesture Nav Edu animation scales to fit different screen sizes" into udc-qpr-dev am: 15b0c9ea54

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

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

quickstep/src/com/android/quickstep/interaction/TutorialController.java

diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
index ed2d18a..545a94d 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialController.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialController.java
@@ -226,13 +226,11 @@
             return;
         }
         Matrix scaleMatrix = new Matrix();
-        float pivotX = mScreenWidth / 2f;
-        float pivotY = mScreenHeight;
         float scaleFactor = mScreenWidth / animationBoundsRect.width();
+        float heightTranslate = (mScreenHeight - (scaleFactor * animationBoundsRect.height()));
 
-        scaleMatrix.postScale(scaleFactor, scaleFactor, pivotX, pivotY);
-        scaleMatrix.postTranslate(0,
-                mTutorialFragment.getDeviceProfile().heightPx - animationBoundsRect.height());
+        scaleMatrix.postScale(scaleFactor, scaleFactor);
+        scaleMatrix.postTranslate(0, heightTranslate);
         mAnimatedGestureDemonstration.setImageMatrix(scaleMatrix);
     }