Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cabec12 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-6122ccdb-5b5a-43f4-8f32-3d9e1a775ee9" into... 

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: 707c09d3
  Set correct target position for other targets
parents 5ac259c4 8c7e5cb1

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

+2 −2
Original line number Diff line number Diff line
@@ -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,