diff options
| author | Winson Chung <winsonc@google.com> | 2018-06-08 19:19:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-06-08 19:19:29 +0000 |
| commit | 0a1d6b530a2ea50d1c3211b6b656e589a3c906d3 (patch) | |
| tree | 9bf66c7afd32cf6a93f45f2ed4c1c3e8870b3eb6 | |
| parent | b5b89acc0982a88bcf34b510e5ad17c23ca036af (diff) | |
| parent | 707c09d3e327eb0fe57039e4f9cd98c797767c48 (diff) | |
| download | android_packages_apps_Trebuchet-0a1d6b530a2ea50d1c3211b6b656e589a3c906d3.tar.gz android_packages_apps_Trebuchet-0a1d6b530a2ea50d1c3211b6b656e589a3c906d3.tar.bz2 android_packages_apps_Trebuchet-0a1d6b530a2ea50d1c3211b6b656e589a3c906d3.zip | |
Merge "Set correct target position for other targets" into ub-launcher3-edmonton
| -rw-r--r-- | quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java index 4c90cbeb0..72d6260ab 100644 --- a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java +++ b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java @@ -618,7 +618,7 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag 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 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag 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, |