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

Commit 1323ed89 authored by Yunfan Chen's avatar Yunfan Chen Committed by Android (Google) Code Review
Browse files

Merge "Do not load DecorView info if a task is closing" into main

parents 926b257a b610010f

core/java/android/window/DesktopModeFlags.java

+2 −0
Original line number Diff line number Diff line
@@ -146,6 +146,8 @@ public enum DesktopModeFlags { 
            Flags::includeTopTransparentFullscreenTaskInDesktopHeuristic, true),

    INHERIT_TASK_BOUNDS_FOR_TRAMPOLINE_TASK_LAUNCHES(

            Flags::inheritTaskBoundsForTrampolineTaskLaunches, false),

    SKIP_DECOR_VIEW_RELAYOUT_WHEN_CLOSING_BUGFIX(

            Flags::skipDecorViewRelayoutWhenClosingBugfix, false),

    // go/keep-sorted end

    ;

core/java/android/window/flags/lse_desktop_experience.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -932,6 +932,16 @@ flag { 
    }

}



flag {

    name: "skip_decor_view_relayout_when_closing_bugfix"

    namespace: "lse_desktop_experience"

    description: "Enables bugfix to skip DecorView relayout when the corresponding window is closing."

    bug: "394502142"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "enable_size_compat_mode_improvements_for_connected_displays"

    namespace: "lse_desktop_experience"

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java

+3 −1
Original line number Diff line number Diff line
@@ -553,7 +553,9 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
            return;

        }



        if (oldRootView != mResult.mRootView) {

        if (DesktopModeFlags.SKIP_DECOR_VIEW_RELAYOUT_WHEN_CLOSING_BUGFIX.isTrue()

                ? (oldRootView != mResult.mRootView && taskInfo.isVisibleRequested)

                : oldRootView != mResult.mRootView) {

            disposeStatusBarInputLayer();

            mWindowDecorViewHolder = createViewHolder();

            // Load these only when first creating the view.