commit a8e2ad2c1fc43b9ac26ddeca3c778437ba2710b0
author Tony Wickham <twickham@google.com> Wed Sep 23 18:52:33 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 23 18:52:33 2020 +0000
tree fdd1f2e261a23d2555836377e3d597e7ff0ee4eb
parent 9d15815f8472fa58a94353389aba74ae0f97ef31
parent 657f396c9c12bb8b76ae599879be535ce022795b

Merge "Scale task view in TaskViewSimulator before translating it" into ub-launcher3-master

quickstep/src/com/android/quickstep/util/TaskViewSimulator.java

diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index 903e87a..081413e 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -297,9 +297,9 @@
         mMatrix.postTranslate(insets.left, insets.top);
         mMatrix.postScale(scale, scale);
 
-        // Apply TaskView matrix: translate, scale, scroll
-        mMatrix.postTranslate(mTaskRect.left, mTaskRect.top + mOffsetY);
+        // Apply TaskView matrix: scale, translate, scroll
         mMatrix.postScale(mCurveScale, mCurveScale, taskWidth / 2, taskHeight / 2);
+        mMatrix.postTranslate(mTaskRect.left, mTaskRect.top + mOffsetY);
         mOrientationState.getOrientationHandler().set(
                 mMatrix, MATRIX_POST_TRANSLATE, mScrollState.scroll);