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

Commit c79e8f97 authored by Chris Li's avatar Chris Li Committed by Android (Google) Code Review
Browse files

Merge "Fix the jumpcut surface position" into main

parents 247a20f2 14cffa53

libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java

+11 −4
Original line number Diff line number Diff line
@@ -395,10 +395,17 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { 
                    continue;

                }

                // No default animation for this, so just update bounds/position.

                if (change.getParent() == null) {

                    // For independent change without a parent, we have reparented it to the root

                    // leash in Transitions#setupAnimHierarchy.

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

                    startTransaction.setPosition(change.getLeash(),

                            change.getEndAbsBounds().left - info.getRoot(rootIdx).getOffset().x,

                            change.getEndAbsBounds().top - info.getRoot(rootIdx).getOffset().y);

                } else {

                    startTransaction.setPosition(change.getLeash(),

                            change.getEndRelOffset().x, change.getEndRelOffset().y);

                }

                // Seamless display transition doesn't need to animate.

                if (isSeamlessDisplayChange) continue;

                if (isTask || (change.hasFlags(FLAG_IN_TASK_WITH_EMBEDDED_ACTIVITY)