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

Commit cf771589 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update split context when display size changed" into tm-qpr-dev am:... 

Merge "Update split context when display size changed" into tm-qpr-dev am: 14bc5738 am: 6195cba9

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



Change-Id: I145d0050a4f9284fd3365473e35d928b3153c79d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f8e175de 6195cba9

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

+4 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
    private boolean mFreezeDividerWindow = false;

    private int mOrientation;

    private int mRotation;

    private int mDensity;



    private final boolean mDimNonImeSide;
@@ -290,9 +291,11 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
        final int rotation = configuration.windowConfiguration.getRotation();

        final Rect rootBounds = configuration.windowConfiguration.getBounds();

        final int orientation = configuration.orientation;

        final int density = configuration.densityDpi;



        if (mOrientation == orientation

                && mRotation == rotation

                && mDensity == density

                && mRootBounds.equals(rootBounds)) {

            return false;

        }
@@ -303,6 +306,7 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
        mTempRect.set(mRootBounds);

        mRootBounds.set(rootBounds);

        mRotation = rotation;

        mDensity = density;

        mDividerSnapAlgorithm = getSnapAlgorithm(mContext, mRootBounds, null);

        initDividerPosition(mTempRect);

        updateInvisibleRect();

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

+9 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.wm.shell.common.split;



import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;

import static android.content.res.Configuration.ORIENTATION_PORTRAIT;



import static com.google.common.truth.Truth.assertThat;
@@ -91,6 +92,14 @@ public class SplitLayoutTests extends ShellTestCase { 
        // Verify updateConfiguration returns true if the root bounds changed.

        config.windowConfiguration.setBounds(new Rect(0, 0, 2160, 1080));

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



        // Verify updateConfiguration returns true if the orientation changed.

        config.orientation = ORIENTATION_LANDSCAPE;

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



        // Verify updateConfiguration returns true if the density changed.

        config.densityDpi = 123;

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

    }



    @Test