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

Commit 2af1cde0 authored by Jerry Chang's avatar Jerry Chang
Browse files

Fix not updating split bounds after devices unfolded 

When the default display changed due to unfolded the device, the split
root tasks might be changed to invisible before reporting display info
changed to split component. This causing the split component didn't
update split layout due to the divider bar is not "initialized" after
released with stage roots changed to invisible.

This makes sure to update split layout while the split is activated no
matter the divider bar is initialized or not.

Fix: 189726605
Test: atest WMShellUnitTests
Test: check the split bounds updated properly after the device unfolded.
Change-Id: I722b08116a97b8482ea6e25b60ffe71005076cd7
parent 8915168f

libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java

+2 −3
Original line number Diff line number Diff line
@@ -172,13 +172,12 @@ public final class SplitLayout { 
            affectsLayout = true;

        }



        if (mInitialized && affectsLayout) {

        if (mInitialized) {

            release();

            init();

            return true;

        }



        return false;

        return affectsLayout;

    }



    /** Updates recording bounds of divider window and both of the splits. */

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+2 −1
Original line number Diff line number Diff line
@@ -602,7 +602,8 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
    public void onDisplayAreaInfoChanged(DisplayAreaInfo displayAreaInfo) {

        mDisplayAreaInfo = displayAreaInfo;

        if (mSplitLayout != null

                && mSplitLayout.updateConfiguration(mDisplayAreaInfo.configuration)) {

                && mSplitLayout.updateConfiguration(mDisplayAreaInfo.configuration)

                && mMainStage.isActive()) {

            onBoundsChanged(mSplitLayout);

        }

    }

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/split/SplitLayoutTests.java

+0 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ public class SplitLayoutTests extends ShellTestCase { 
    @UiThreadTest

    public void testUpdateConfiguration() {

        final Configuration config = getConfiguration();

        mSplitLayout.init();



        // Verify it returns true if new config won't affect split layout.

        assertThat(mSplitLayout.updateConfiguration(config)).isFalse();