commit 8c7e5cb111620b650ca04aca887b2a8056217960
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Jun 07 14:40:54 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Jun 07 14:40:54 2018 +0000
tree 94ce43c56bb064668875c3d42a5ae9cbe900c6d6
parent 34838cf551cdc9b948a144ddadfc0d6117096d63
parent 707c09d3e327eb0fe57039e4f9cd98c797767c48

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

Change-Id: I953aaf62740e0e9408cde6a5a337e6f2a1f96be4

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,