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

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

Merge "Renames getDimArea to getDimAreaBehavior" into main

parents c7d04194 f73a6d11

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

+2 −2
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { 


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

        final boolean dimOnTask = !isStacked

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

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

                && Flags.fullscreenDimFlag();

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

        setTaskFragmentDimOnTask(wct, secondaryContainer.getTaskFragmentToken(), dimOnTask);
@@ -590,7 +590,7 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer { 
        final boolean isFillParent = relativeBounds.isEmpty();

        final boolean isIsolatedNavigated = !isFillParent && container.isOverlay();

        final boolean dimOnTask = !isFillParent

                && attributes.getWindowAttributes().getDimArea() == DIM_AREA_ON_TASK

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

                && Flags.fullscreenDimFlag();

        final IBinder fragmentToken = container.getTaskFragmentToken();