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

Commit 0a6d1a1d authored by Chris Li's avatar Chris Li Committed by Android (Google) Code Review
Browse files

Merge "Update EmbeddedActivityWindowInfo constructor" into main

parents dc22ecf8 cc4dc6b2

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

+1 −3
Original line number Diff line number Diff line
@@ -3137,11 +3137,9 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
    private static EmbeddedActivityWindowInfo translateActivityWindowInfo(

            @NonNull Activity activity, @NonNull ActivityWindowInfo activityWindowInfo) {

        final boolean isEmbedded = activityWindowInfo.isEmbedded();

        final Rect activityBounds = new Rect(activity.getResources().getConfiguration()

                .windowConfiguration.getBounds());

        final Rect taskBounds = new Rect(activityWindowInfo.getTaskBounds());

        final Rect activityStackBounds = new Rect(activityWindowInfo.getTaskFragmentBounds());

        return new EmbeddedActivityWindowInfo(activity, isEmbedded, activityBounds, taskBounds,

        return new EmbeddedActivityWindowInfo(activity, isEmbedded, taskBounds,

                activityStackBounds);

    }

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

+1 −3
Original line number Diff line number Diff line
@@ -1570,8 +1570,6 @@ public class SplitControllerTest { 
        mSetFlagRule.enableFlags(Flags.FLAG_ACTIVITY_WINDOW_INFO_FLAG);



        final boolean isEmbedded = true;

        final Rect activityBounds = mActivity.getResources().getConfiguration().windowConfiguration

                .getBounds();

        final Rect taskBounds = new Rect(0, 0, 1000, 2000);

        final Rect activityStackBounds = new Rect(0, 0, 500, 2000);

        doReturn(isEmbedded).when(mActivityWindowInfo).isEmbedded();
@@ -1579,7 +1577,7 @@ public class SplitControllerTest { 
        doReturn(activityStackBounds).when(mActivityWindowInfo).getTaskFragmentBounds();



        final EmbeddedActivityWindowInfo expected = new EmbeddedActivityWindowInfo(mActivity,

                isEmbedded, activityBounds, taskBounds, activityStackBounds);

                isEmbedded, taskBounds, activityStackBounds);

        assertEquals(expected, mSplitController.getEmbeddedActivityWindowInfo(mActivity));

    }