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

Commit b1f65ff2 authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Remove fullscreen_dim_flag" into main

parents c2fc6685 83dd7bf0

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

+0 −7
Original line number Diff line number Diff line
@@ -17,13 +17,6 @@ flag { 
    bug: "284050041"

}



flag {

    namespace: "windowing_sdk"

    name: "fullscreen_dim_flag"

    description: "Whether to allow showing fullscreen dim on ActivityEmbedding split"

    bug: "293797706"

}



flag {

    namespace: "windowing_sdk"

    name: "activity_embedding_interactive_divider_flag"

libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java

+1 −3
Original line number Diff line number Diff line
@@ -405,8 +405,7 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { 


        // Sets the dim area when the two TaskFragments are adjacent.

        final boolean dimOnTask = !isStacked

                && splitAttributes.getWindowAttributes().getDimAreaBehavior() == DIM_AREA_ON_TASK

                && Flags.fullscreenDimFlag();

                && splitAttributes.getWindowAttributes().getDimAreaBehavior() == DIM_AREA_ON_TASK;

        setTaskFragmentDimOnTask(wct, primaryContainer.getTaskFragmentToken(), dimOnTask);

        setTaskFragmentDimOnTask(wct, secondaryContainer.getTaskFragmentToken(), dimOnTask);
@@ -646,7 +645,6 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { 
                container);

        final boolean isFillParent = relativeBounds.isEmpty();

        final boolean dimOnTask = !isFillParent

                && Flags.fullscreenDimFlag()

                && attributes.getWindowAttributes().getDimAreaBehavior() == DIM_AREA_ON_TASK;

        final IBinder fragmentToken = container.getTaskFragmentToken();