commit ff3f2a07f2f71cb77bdd39fc1e15f9bef5df6187
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Jun 07 14:40:57 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Jun 07 14:40:57 2018 +0000
tree cb3240ee12644482c9f62ca7ff89ba3188211053
parent ea15d92bad38e164590d472d6cbde8783e35876f
parent 8c7e5cb111620b650ca04aca887b2a8056217960

[automerger] Set correct target position for other targets am: 707c09d3e3 am: 8c7e5cb111

Change-Id: I2567e3235c149b06fbb9efd1554a5fd90f3a4168

quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java

diff --git a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java
index 114f96a..b895704 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;
                     }
@@ -735,7 +735,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,