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

Commit d9e0867e authored by Charles Chen's avatar Charles Chen Committed by Automerger Merge Worker
Browse files

Merge "Update Window Extensions library" into tm-qpr-dev am: f0471940 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20958324



Change-Id: I1414534a2da09cddf60b119718aea9bba4a45d86
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 61e03c16 f0471940

libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/SplitPresenterTest.java

+4 −3
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ import androidx.test.core.app.ApplicationProvider; 
import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;

import androidx.window.common.DeviceStateManagerFoldingFeatureProducer;

import androidx.window.extensions.core.util.function.Function;

import androidx.window.extensions.layout.WindowLayoutComponentImpl;

import androidx.window.extensions.layout.WindowLayoutInfo;
@@ -562,10 +563,10 @@ public class SplitPresenterTest { 
                                SplitAttributes.SplitType.RatioSplitType.splitEqually()

                        )

                ).build();

        final Function<SplitAttributesCalculatorParams, SplitAttributes> calculator =

                params -> splitAttributes;



        mController.setSplitAttributesCalculator(params -> {

            return splitAttributes;

        });

        mController.setSplitAttributesCalculator(calculator);



        assertEquals(splitAttributes, mPresenter.computeSplitAttributes(taskProperties,

                splitPairRule, null /* minDimensionsPair */));