Merge changes from topic "am-6122ccdb-5b5a-43f4-8f32-3d9e1a775ee9" into ub-launcher3-edmonton-polish
* changes:
[automerger] Set correct target position for other targets am: 707c09d3e3
Set correct target position for other targets
diff --git a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
index 4c90cbe..72d6260 100644
--- a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
@@ -618,7 +618,7 @@
targetCrop = crop;
alpha = mAlpha.value;
} else {
- matrix.reset();
+ matrix.setTranslate(target.position.x, target.position.y);
alpha = 1f;
targetCrop = target.sourceContainerBounds;
}
@@ -736,7 +736,7 @@
matrix.postTranslate(target.position.x, target.position.y);
alpha = mAlpha.value;
} else {
- matrix.reset();
+ matrix.setTranslate(target.position.x, target.position.y);
alpha = 1f;
}
params[i] = new SurfaceParams(target.leash, alpha, matrix,