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

Commit 53678645 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Mark lastNonFullscreenBounds as null." into main

parents f7cc6de2 57a4ecb1

core/java/android/app/TaskInfo.java

+1 −0
Original line number Diff line number Diff line
@@ -364,6 +364,7 @@ public class TaskInfo { 
     * The last non-fullscreen bounds the task was launched in or resized to.

     * @hide

     */

    @Nullable

    public Rect lastNonFullscreenBounds;



    /**

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopPipTransitionController.kt

+2 −5
Original line number Diff line number Diff line
@@ -64,11 +64,8 @@ class DesktopPipTransitionController( 
        }



        val defaultFreeformBounds =

            if (parentTask.lastNonFullscreenBounds.isEmpty) {

                calculateDefaultDesktopTaskBounds(pipDesktopState.getCurrentDisplayLayout())

            } else {

                parentTask.lastNonFullscreenBounds

            }

            parentTask.lastNonFullscreenBounds?.takeUnless { it.isEmpty }

                ?: calculateDefaultDesktopTaskBounds(pipDesktopState.getCurrentDisplayLayout())



        val newResolvedWinMode =

            if (pipDesktopState.isPipInDesktopMode()) WINDOWING_MODE_FREEFORM