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

Commit b27f2322 authored by Tiger Huang's avatar Tiger Huang Committed by Android (Google) Code Review
Browse files

Merge "Update mPosition when creating a new InsetsSourceControl" into main

parents b7a6aa1b b9474405

services/core/java/com/android/server/wm/InsetsSourceProvider.java

+2 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ class InsetsSourceProvider { 
        }

        final Point position = getWindowFrameSurfacePosition();

        if (!mPosition.equals(position)) {

            mPosition.set(position.x, position.y);

            mPosition.set(position);

            if (windowState != null && windowState.getWindowFrames().didFrameSizeChange()

                    && windowState.mWinAnimator.getShown() && mWindowContainer.okToDisplay()) {

                mHasPendingPosition = true;
@@ -553,6 +553,7 @@ class InsetsSourceProvider { 
        }

        boolean initiallyVisible = mClientVisible;

        final Point surfacePosition = getWindowFrameSurfacePosition();

        mPosition.set(surfacePosition);

        mAdapter = new ControlAdapter(surfacePosition);

        if (mSource.getType() == WindowInsets.Type.ime()) {

            if (android.view.inputmethod.Flags.refactorInsetsController()) {

services/tests/wmtests/src/com/android/server/wm/InsetsSourceProviderTest.java

+22 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import static org.junit.Assert.assertNull; 
import static org.junit.Assert.assertTrue;



import android.graphics.Insets;

import android.graphics.Point;

import android.graphics.Rect;

import android.platform.test.annotations.Presubmit;

import android.view.InsetsSource;
@@ -259,6 +260,27 @@ public class InsetsSourceProviderTest extends WindowTestsBase { 
        assertEquals(Insets.of(0, 0, 0, 100), insets);

    }



    @Test

    public void testUpdateInsetsControlPosition() {

        final WindowState target = createWindow(null, TYPE_APPLICATION, "target");



        final WindowState ime1 = createWindow(null, TYPE_INPUT_METHOD, "ime1");

        ime1.getFrame().set(new Rect(0, 0, 0, 0));

        mImeProvider.setWindowContainer(ime1, null, null);

        mImeProvider.updateControlForTarget(target, false /* force */, null /* statsToken */);

        ime1.getFrame().set(new Rect(0, 400, 500, 500));

        mImeProvider.updateInsetsControlPosition(ime1);

        assertEquals(new Point(0, 400), mImeProvider.getControl(target).getSurfacePosition());



        final WindowState ime2 = createWindow(null, TYPE_INPUT_METHOD, "ime2");

        ime2.getFrame().set(new Rect(0, 0, 0, 0));

        mImeProvider.setWindowContainer(ime2, null, null);

        mImeProvider.updateControlForTarget(target, false /* force */, null /* statsToken */);

        ime2.getFrame().set(new Rect(0, 400, 500, 500));

        mImeProvider.updateInsetsControlPosition(ime2);

        assertEquals(new Point(0, 400), mImeProvider.getControl(target).getSurfacePosition());

    }



    @Test

    public void testSetRequestedVisibleTypes() {

        final WindowState statusBar = createWindow(null, TYPE_APPLICATION, "statusBar");