diff options
| author | 2024-03-04 05:29:06 +0000 | |
|---|---|---|
| committer | 2024-03-04 05:29:06 +0000 | |
| commit | d1d55da3ae3af17e1dfbacb0381b16c3378b795b (patch) | |
| tree | 90dd497e10d62fe3979b0e98a40f71aab16ebafd /libs | |
| parent | c7d041946c003b24500bb1fada9ebecbe10d385d (diff) | |
| parent | f73a6d11b1a25260faaa277c4e6883bf7ce3cefc (diff) | |
Merge "Renames getDimArea to getDimAreaBehavior" into main
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java index 2f2da8c53db0..b53b9c519cb6 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java @@ -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(); |