commit | 1a6522f7bf52cec6dc54e0d113a1dd5e8ab53ace | [log] [tgz] |
---|---|---|
author | Saumya Prakash <saumyaprakash@google.com> | Tue Sep 05 13:57:34 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 05 13:57:34 2023 +0000 |
tree | 99d6fe288f967c8f187d6d6d597143398ea5c6c1 | |
parent | 4bfc41aeecc292dd7a4ff3885d76315d1ee6a9ca [diff] | |
parent | 7146fc249f3ba7ba7fc8674ecc86ab3e8a756d33 [diff] |
Ensure Gesture Nav Edu animation scales to fit different screen sizes am: 7146fc249f Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24642559 Change-Id: I2de39364096864d4d92c8a2a187da4ad5abe1a1b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialController.java b/quickstep/src/com/android/quickstep/interaction/TutorialController.java index 4a1fec3..139083b 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); }