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

Commit cd672f38 authored by Jerry Chang's avatar Jerry Chang Committed by Automerger Merge Worker
Browse files

Merge "Fix not updating split bounds after devices unfolded" into sc-v2-dev am: 11a26a56 

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

Change-Id: Ie2f7e00b52eee7cbdac5f606f6c4334f4c34dfa8
parents 560208f5 11a26a56

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();