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

Commit 17cd89a0 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Make a copy for local surface in transition info" into main

parents 08e29dc4 7b7177ef

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitTransitionModifier.kt

+3 −1
Original line number Diff line number Diff line
@@ -47,7 +47,9 @@ class SplitTransitionModifier { 
            Slog.w(TAG, "addDimLayerToTransition but leash was released or not created")

        } else {

            val change =

                TransitionInfo.Change(null,  /* token */dimLayer)

                TransitionInfo.Change(null /* container */,

                    SurfaceControl(dimLayer, "addDimLayerToTransition")

                )

            change.parent = parentToken

            change.setStartAbsBounds(bounds)

            change.setEndAbsBounds(bounds)

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+3 −1
Original line number Diff line number Diff line
@@ -4432,7 +4432,9 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            return;

        }



        final TransitionInfo.Change barChange = new TransitionInfo.Change(null /* token */, leash);

        final TransitionInfo.Change barChange = new TransitionInfo.Change(null /* token */,

                // Make a copy because the transition leash may be released on finish.

                new SurfaceControl(leash, "addDividerBarToTransition"));

        mSplitLayout.getRefDividerBounds(mTempRect1);

        int displayId = SplitMultiDisplayHelper.getTransitionDisplayId(info);

        barChange.setParent(mSplitMultiDisplayHelper.getDisplayRootTaskInfo(displayId).token);