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

Commit bc09800d authored by Pechetty Sravani's avatar Pechetty Sravani Committed by Louis Chang
Browse files

[RESTRICT AUTOMERGE] Partially revert "Do not update TFParentInfo while invisible" 

This reverts commit a247d407.

Reason for revert: Culprit for b/339590327. Remove the test as it uses API not available yet.

Change-Id: I98744302025e70b718c3f424fe52393b07ebdc3d
Merged-In: Ibb719519e2ab075cc44fb7273409947f1a8aac52
parent a247d407

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

+0 −42
Original line number Diff line number Diff line
@@ -1529,48 +1529,6 @@ public class SplitControllerTest { 
                .getTopNonFinishingActivity(), secondaryActivity);

    }



    @Test

    public void testTaskFragmentParentInfoChanged() {

        // Making a split

        final Activity secondaryActivity = createMockActivity();

        addSplitTaskFragments(mActivity, secondaryActivity, false /* clearTop */);



        // Updates the parent info.

        final TaskContainer taskContainer = mSplitController.getTaskContainer(TASK_ID);

        final Configuration configuration = new Configuration();

        final TaskFragmentParentInfo originalInfo = new TaskFragmentParentInfo(configuration,

                DEFAULT_DISPLAY, true /* visible */, false /* hasDirectActivity */,

                null /* decorSurface */);

        mSplitController.onTaskFragmentParentInfoChanged(mock(WindowContainerTransaction.class),

                TASK_ID, originalInfo);

        assertTrue(taskContainer.isVisible());



        // Making a public configuration change while the Task is invisible.

        configuration.densityDpi += 100;

        final TaskFragmentParentInfo invisibleInfo = new TaskFragmentParentInfo(configuration,

                DEFAULT_DISPLAY, false /* visible */, false /* hasDirectActivity */,

                null /* decorSurface */);

        mSplitController.onTaskFragmentParentInfoChanged(mock(WindowContainerTransaction.class),

                TASK_ID, invisibleInfo);



        // Ensure the TaskContainer is inivisible, but the configuration is not updated.

        assertFalse(taskContainer.isVisible());

        assertTrue(taskContainer.getTaskFragmentParentInfo().getConfiguration().diffPublicOnly(

                configuration) > 0);



        // Updates when Task to become visible

        final TaskFragmentParentInfo visibleInfo = new TaskFragmentParentInfo(configuration,

                DEFAULT_DISPLAY, true /* visible */, false /* hasDirectActivity */,

                null /* decorSurface */);

        mSplitController.onTaskFragmentParentInfoChanged(mock(WindowContainerTransaction.class),

                TASK_ID, visibleInfo);



        // Ensure the Task is visible and configuration is updated.

        assertTrue(taskContainer.isVisible());

        assertFalse(taskContainer.getTaskFragmentParentInfo().getConfiguration().diffPublicOnly(

                configuration) > 0);

    }



    /** Creates a mock activity in the organizer process. */

    private Activity createMockActivity() {

        return createMockActivity(TASK_ID);