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

Commit 9231c7fc authored by Minche Li's avatar Minche Li Committed by Automerger Merge Worker
Browse files

Merge "Correct magnification switch button position after screen size is... 

Merge "Correct magnification switch button position after screen size is changed" into sc-v2-dev am: 35849cd0

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

Change-Id: If06739def677e89c20fb81524b4b04bf8c6035cf
parents b8304988 35849cd0

packages/SystemUI/src/com/android/systemui/accessibility/MagnificationModeSwitch.java

+2 −1
Original line number Diff line number Diff line
@@ -310,7 +310,8 @@ class MagnificationModeSwitch implements MagnificationGestureDetector.OnGestureL 
    }



    void onConfigurationChanged(int configDiff) {

        if ((configDiff & ActivityInfo.CONFIG_ORIENTATION) != 0) {

        if ((configDiff & (ActivityInfo.CONFIG_ORIENTATION | ActivityInfo.CONFIG_SCREEN_SIZE))

                != 0) {

            final Rect previousDraggableBounds = new Rect(mDraggableWindowBounds);

            mDraggableWindowBounds.set(getDraggableWindowBounds());

            // Keep the Y position with the same height ratio before the window bounds and

packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationModeSwitchTest.java

+24 −0
Original line number Diff line number Diff line
@@ -507,6 +507,30 @@ public class MagnificationModeSwitchTest extends SysuiTestCase { 
                expectedY, mWindowManager.getLayoutParamsFromAttachedView().y);

    }



    @Test

    public void onScreenSizeChanged_buttonIsShowingOnTheRightSide_expectedPosition() {

        final Rect windowBounds = mWindowManager.getCurrentWindowMetrics().getBounds();

        mMagnificationModeSwitch.showButton(ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN);

        final Rect oldDraggableBounds = new Rect(mMagnificationModeSwitch.mDraggableWindowBounds);

        final float windowHeightFraction =

                (float) (mWindowManager.getLayoutParamsFromAttachedView().y

                        - oldDraggableBounds.top) / oldDraggableBounds.height();



        // The window bounds and the draggable bounds are changed due to the screen size change.

        final Rect tmpRect = new Rect(windowBounds);

        tmpRect.scale(2);

        final Rect newWindowBounds = new Rect(tmpRect);

        mWindowManager.setWindowBounds(newWindowBounds);

        mMagnificationModeSwitch.onConfigurationChanged(ActivityInfo.CONFIG_SCREEN_SIZE);



        final int expectedX = mMagnificationModeSwitch.mDraggableWindowBounds.right;

        final int expectedY = (int) (windowHeightFraction

                * mMagnificationModeSwitch.mDraggableWindowBounds.height())

                + mMagnificationModeSwitch.mDraggableWindowBounds.top;

        assertEquals(expectedX, mWindowManager.getLayoutParamsFromAttachedView().x);

        assertEquals(expectedY, mWindowManager.getLayoutParamsFromAttachedView().y);

    }



    private void assertModeUnchanged(int expectedMode) {

        final int actualMode = Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE, 0);