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

Commit f74128ec authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update the surface position when changing TransitionInfo.Root" into... 

Merge "Update the surface position when changing TransitionInfo.Root" into main am: fecb931f am: 8639fc02

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3235604



Change-Id: I0f7476f9bf8e48f34b75aa4189e884342bf1226d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bad834c0 8639fc02

libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java

+5 −2
Original line number Diff line number Diff line
@@ -1148,9 +1148,12 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler, 
                                change, layer, info, t, mLeashMap);

                        appearedTargets[nextTargetIdx++] = target;

                        // reparent into the original `mInfo` since that's where we are animating.

                        final int rootIdx = TransitionUtil.rootIndexFor(change, mInfo);

                        final TransitionInfo.Root root = TransitionUtil.getRootFor(change, mInfo);

                        final boolean wasClosing = closingIdx >= 0;

                        t.reparent(target.leash, mInfo.getRoot(rootIdx).getLeash());

                        t.reparent(target.leash, root.getLeash());

                        t.setPosition(target.leash,

                                change.getStartAbsBounds().left - root.getOffset().x,

                                change.getStartAbsBounds().top - root.getOffset().y);

                        t.setLayer(target.leash, layer);

                        if (wasClosing) {

                            // App was previously visible and is closing