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

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

Merge changes from topics "presubmit-am-5fd168d48bd342588d0e4ecebec59023",... 

Merge changes from topics "presubmit-am-5fd168d48bd342588d0e4ecebec59023", "presubmit-am-ba97c7d37aa34eb7805ec5598caea41d" into tm-dev am: 1c4a8c20

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

Change-Id: I95f5c48004a26eb5cc488e0711899374d182881a
parents c7bb5fa1 1c4a8c20

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

+122 −62
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ import static com.android.server.wm.DisplayContentProto.SLEEP_TOKENS; 
import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_ALL;

import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_APP_TRANSITION;

import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_RECENTS;

import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_WINDOW_ANIMATION;

import static com.android.server.wm.WindowContainer.AnimationFlags.PARENTS;

import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION;

import static com.android.server.wm.WindowContainerChildProto.DISPLAY_CONTENT;
@@ -627,9 +628,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
    @VisibleForTesting

    SurfaceControl mInputMethodSurfaceParent;



    /** The screenshot IME surface to place on the task while transitioning to the next task. */

    SurfaceControl mImeScreenshot;



    private final PointerEventDispatcher mPointerEventDispatcher;



    private final InsetsStateController mInsetsStateController;
@@ -3974,10 +3972,13 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        // If the IME target is the input target, before it changes, prepare the IME screenshot

        // for the last IME target when its task is applying app transition. This is for the

        // better IME transition to keep IME visibility when transitioning to the next task.

        if (mImeLayeringTarget != null && mImeLayeringTarget.isAnimating(PARENTS | TRANSITION,

                ANIMATION_TYPE_APP_TRANSITION | ANIMATION_TYPE_RECENTS)

                && mImeLayeringTarget == mImeInputTarget) {

            attachAndShowImeScreenshotOnTarget();

        if (mImeLayeringTarget != null && mImeLayeringTarget == mImeInputTarget) {

            boolean nonAppImeTargetAnimatingExit = mImeLayeringTarget.mAnimatingExit

                    && mImeLayeringTarget.mAttrs.type != TYPE_BASE_APPLICATION

                    && mImeLayeringTarget.isSelfAnimating(0, ANIMATION_TYPE_WINDOW_ANIMATION);

            if (mImeLayeringTarget.inAppOrRecentsTransition() || nonAppImeTargetAnimatingExit) {

                showImeScreenshot();

            }

        }



        ProtoLog.i(WM_DEBUG_IME, "setInputMethodTarget %s", target);
@@ -4025,71 +4026,129 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        mImeControlTarget = target;

    }



    @VisibleForTesting

    void attachAndShowImeScreenshotOnTarget() {

        // No need to attach screenshot if the IME target not exists or screen is off.

        if (!shouldImeAttachedToApp() || !mWmService.mPolicy.isScreenOn()) {

            return;

    // ========== Begin of ImeScreenshot stuff ==========

    /** The screenshot IME surface to place on the task while transitioning to the next task. */

    ImeScreenshot mImeScreenshot;



    static final class ImeScreenshot {

        private WindowState mImeTarget;

        private SurfaceControl.Builder mSurfaceBuilder;

        private SurfaceControl mImeSurface;



        ImeScreenshot(SurfaceControl.Builder surfaceBuilder, @NonNull WindowState imeTarget) {

            mSurfaceBuilder = surfaceBuilder;

            mImeTarget = imeTarget;

        }



        final SurfaceControl.Transaction t = getPendingTransaction();

        WindowState getImeTarget() {

            return mImeTarget;

        }



        private SurfaceControl createImeSurface(SurfaceControl.ScreenshotHardwareBuffer b,

                Transaction t) {

            final HardwareBuffer buffer = b.getHardwareBuffer();

            if (DEBUG_INPUT_METHOD) {

                Slog.d(TAG, "create IME snapshot for "

                        + mImeTarget + ", buff width=" + buffer.getWidth()

                        + ", height=" + buffer.getHeight());

            }

            final WindowState imeWindow = mImeTarget.getDisplayContent().mInputMethodWindow;

            final ActivityRecord activity = mImeTarget.mActivityRecord;

            final SurfaceControl imeParent = mImeTarget.mAttrs.type == TYPE_BASE_APPLICATION

                    ? activity.getSurfaceControl()

                    : mImeTarget.getSurfaceControl();

            final SurfaceControl imeSurface = mSurfaceBuilder

                    .setName("IME-snapshot-surface")

                    .setBLASTLayer()

                    .setFormat(buffer.getFormat())

                    // Attaching IME snapshot to the associated IME layering target on the

                    // activity when:

                    // - The target is activity main window: attaching on top of the activity.

                    // - The target is non-activity main window (e.g. activity overlay or

                    // dialog-themed activity): attaching on top of the target since the layer has

                    // already above the activity.

                    .setParent(imeParent)

                    .setCallsite("DisplayContent.attachAndShowImeScreenshotOnTarget")

                    .build();

            // Make IME snapshot as trusted overlay

            InputMonitor.setTrustedOverlayInputInfo(imeSurface, t, imeWindow.getDisplayId(),

                    "IME-snapshot-surface");

            t.setBuffer(imeSurface, buffer);

            t.setColorSpace(activity.mSurfaceControl, ColorSpace.get(ColorSpace.Named.SRGB));

            t.setLayer(imeSurface, 1);



            final Point surfacePosition = new Point(

                    imeWindow.getFrame().left - mImeTarget.getFrame().left,

                    imeWindow.getFrame().top - mImeTarget.getFrame().top);

            if (imeParent == activity.getSurfaceControl()) {

                t.setPosition(imeSurface, surfacePosition.x, surfacePosition.y);

            } else {

                surfacePosition.offset(mImeTarget.mAttrs.surfaceInsets.left,

                        mImeTarget.mAttrs.surfaceInsets.top);

                t.setPosition(imeSurface, surfacePosition.x, surfacePosition.y);

            }

            return imeSurface;

        }



        private void removeImeSurface(Transaction t) {

            if (mImeSurface != null) {

                if (DEBUG_INPUT_METHOD) Slog.d(TAG, "remove IME snapshot");

                t.remove(mImeSurface);

                mImeSurface = null;

            }

        }



        void attachAndShow(Transaction t) {

            final DisplayContent dc = mImeTarget.getDisplayContent();

            // Prepare IME screenshot for the target if it allows to attach into.

        if (mInputMethodWindow != null && mInputMethodWindow.isVisible()) {

            final Task task = mImeLayeringTarget.getTask();

            final Task task = mImeTarget.getTask();

            // Re-new the IME screenshot when it does not exist or the size changed.

            final boolean renewImeSurface = mImeScreenshot == null

                    || mImeScreenshot.getWidth() != mInputMethodWindow.getFrame().width()

                    || mImeScreenshot.getHeight() != mInputMethodWindow.getFrame().height();

            final boolean renewImeSurface = mImeSurface == null

                    || mImeSurface.getWidth() != dc.mInputMethodWindow.getFrame().width()

                    || mImeSurface.getHeight() != dc.mInputMethodWindow.getFrame().height();

            if (task != null && !task.isActivityTypeHomeOrRecents()) {

                SurfaceControl.ScreenshotHardwareBuffer imeBuffer = renewImeSurface

                        ? mWmService.mTaskSnapshotController.snapshotImeFromAttachedTask(task)

                        ? dc.mWmService.mTaskSnapshotController.snapshotImeFromAttachedTask(task)

                        : null;

                if (imeBuffer != null) {

                    // Remove the last IME surface when the surface needs to renew.

                    removeImeSurfaceImmediately();

                    mImeScreenshot = createImeSurface(imeBuffer, t);

                    removeImeSurface(t);

                    mImeSurface = createImeSurface(imeBuffer, t);

                }

            }

        }



        final boolean isValidSnapshot = mImeScreenshot != null && mImeScreenshot.isValid();

            final boolean isValidSnapshot = mImeSurface != null && mImeSurface.isValid();

            // Showing the IME screenshot if the target has already in app transition stage.

            // Note that if the current IME insets is not showing, no need to show IME screenshot

            // to reflect the true IME insets visibility and the app task layout as possible.

        if (isValidSnapshot && getInsetsStateController().getImeSourceProvider().isImeShowing()) {

            if (isValidSnapshot

                    && dc.getInsetsStateController().getImeSourceProvider().isImeShowing()) {

                if (DEBUG_INPUT_METHOD) {

                Slog.d(TAG, "show IME snapshot, ime target=" + mImeLayeringTarget);

                    Slog.d(TAG, "show IME snapshot, ime target=" + mImeTarget);

                }

            t.show(mImeScreenshot);

                t.show(mImeSurface);

            } else if (!isValidSnapshot) {

            removeImeSurfaceImmediately();

                removeImeSurface(t);

            }

        }



    @VisibleForTesting

    SurfaceControl createImeSurface(SurfaceControl.ScreenshotHardwareBuffer imeBuffer,

            Transaction t) {

        final HardwareBuffer buffer = imeBuffer.getHardwareBuffer();

        if (DEBUG_INPUT_METHOD) Slog.d(TAG, "create IME snapshot for "

                + mImeLayeringTarget + ", buff width=" + buffer.getWidth()

                + ", height=" + buffer.getHeight());

        final ActivityRecord activity = mImeLayeringTarget.mActivityRecord;

        final SurfaceControl imeSurface = mWmService.mSurfaceControlFactory.apply(null)

                .setName("IME-snapshot-surface")

                .setBLASTLayer()

                .setFormat(buffer.getFormat())

                .setParent(activity.getSurfaceControl())

                .setCallsite("DisplayContent.attachAndShowImeScreenshotOnTarget")

                .build();

        // Make IME snapshot as trusted overlay

        InputMonitor.setTrustedOverlayInputInfo(imeSurface, t, getDisplayId(),

                "IME-snapshot-surface");

        t.setBuffer(imeSurface, buffer);

        t.setColorSpace(mSurfaceControl, ColorSpace.get(ColorSpace.Named.SRGB));

        t.setLayer(imeSurface, 1);

        t.setPosition(imeSurface, mInputMethodWindow.getDisplayFrame().left,

                mInputMethodWindow.getDisplayFrame().top);

        return imeSurface;

        void detach(Transaction t) {

            removeImeSurface(t);

        }

    }



    private void attachAndShowImeScreenshotOnTarget() {

        // No need to attach screenshot if the IME target not exists or screen is off.

        if (!shouldImeAttachedToApp() || !mWmService.mPolicy.isScreenOn()) {

            return;

        }



        final SurfaceControl.Transaction t = getPendingTransaction();

        // Prepare IME screenshot for the target if it allows to attach into.

        if (mInputMethodWindow != null && mInputMethodWindow.isVisible()) {

            mImeScreenshot = new ImeScreenshot(

                    mWmService.mSurfaceControlFactory.apply(null), mImeLayeringTarget);

            mImeScreenshot.attachAndShow(t);

        }

    }



    /**
@@ -4111,8 +4170,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
    void removeImeScreenshotIfPossible() {

        if (mImeLayeringTarget == null

                || mImeLayeringTarget.mAttrs.type != TYPE_APPLICATION_STARTING

                && !mImeLayeringTarget.isAnimating(PARENTS | TRANSITION,

                ANIMATION_TYPE_APP_TRANSITION | ANIMATION_TYPE_RECENTS)) {

                && !mImeLayeringTarget.inAppOrRecentsTransition()) {

            removeImeSurfaceImmediately();

        }

    }
@@ -4120,11 +4178,11 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
    /** Removes the IME screenshot immediately. */

    void removeImeSurfaceImmediately() {

        if (mImeScreenshot != null) {

            if (DEBUG_INPUT_METHOD) Slog.d(TAG, "remove IME snapshot");

            getSyncTransaction().remove(mImeScreenshot);

            mImeScreenshot.detach(getSyncTransaction());

            mImeScreenshot = null;

        }

    }

 // ========== End of ImeScreenshot stuff ==========



    /**

     * The IME input target is the window which receives input from IME. It is also a candidate
@@ -4433,7 +4491,9 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
     * hierarchy.

     */

    void onWindowAnimationFinished(@NonNull WindowContainer wc, int type) {

        if (type == ANIMATION_TYPE_APP_TRANSITION || type == ANIMATION_TYPE_RECENTS) {

        if (mImeScreenshot != null && (wc == mImeScreenshot.getImeTarget()

                || wc.getWindow(w -> w == mImeScreenshot.getImeTarget()) != null)

                && (type & WindowState.EXIT_ANIMATING_TYPES) != 0) {

            removeImeSurfaceImmediately();

        }

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -574,6 +574,7 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe 
                            false /* disableImeIcon */);

                }

            }

            dc.removeImeSurfaceImmediately();

            dc.handleCompleteDeferredRemoval();

        }

    }

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

+9 −14
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ import static com.android.server.wm.ActivityTaskSupervisor.ON_TOP; 
import static com.android.server.wm.DisplayContent.IME_TARGET_LAYERING;

import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_APP_TRANSITION;

import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_FIXED_TRANSFORM;

import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_RECENTS;

import static com.android.server.wm.WindowContainer.AnimationFlags.PARENTS;

import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION;

import static com.android.server.wm.WindowContainer.POSITION_TOP;
@@ -108,6 +107,7 @@ import android.graphics.Insets; 
import android.graphics.Point;

import android.graphics.Rect;

import android.graphics.Region;

import android.hardware.HardwareBuffer;

import android.hardware.display.VirtualDisplay;

import android.metrics.LogMaker;

import android.os.Binder;
@@ -1939,12 +1939,10 @@ public class DisplayContentTests extends WindowTestsBase { 


        // Preparation: Simulate snapshot IME surface.

        spyOn(mWm.mTaskSnapshotController);

        doReturn(mock(SurfaceControl.ScreenshotHardwareBuffer.class)).when(

                mWm.mTaskSnapshotController).snapshotImeFromAttachedTask(any());

        final SurfaceControl imeSurface = mock(SurfaceControl.class);

        spyOn(imeSurface);

        doReturn(true).when(imeSurface).isValid();

        doReturn(imeSurface).when(mDisplayContent).createImeSurface(any(), any());

        SurfaceControl.ScreenshotHardwareBuffer mockHwBuffer = mock(

                SurfaceControl.ScreenshotHardwareBuffer.class);

        doReturn(mock(HardwareBuffer.class)).when(mockHwBuffer).getHardwareBuffer();

        doReturn(mockHwBuffer).when(mWm.mTaskSnapshotController).snapshotImeFromAttachedTask(any());



        // Preparation: Simulate snapshot Task.

        ActivityRecord act1 = createActivityRecord(mDisplayContent);
@@ -1970,21 +1968,18 @@ public class DisplayContentTests extends WindowTestsBase { 
        final WindowState appWin2 = createWindow(null, TYPE_BASE_APPLICATION, act2, "appWin2");

        appWin2.setHasSurface(true);

        assertTrue(appWin2.canBeImeTarget());

        doReturn(true).when(appWin1).isAnimating(PARENTS | TRANSITION,

                ANIMATION_TYPE_APP_TRANSITION | ANIMATION_TYPE_RECENTS);

        doReturn(true).when(appWin1).isClosing();

        doReturn(true).when(appWin1).inAppOrRecentsTransition();



        // Test step 3: Verify appWin2 will be the next IME target and the IME snapshot surface will

        // be shown at this time.

        final Transaction t = mDisplayContent.getPendingTransaction();

        spyOn(t);

        // be attached and shown on the display at this time.

        mDisplayContent.computeImeTarget(true);

        assertEquals(appWin2, mDisplayContent.getImeTarget(IME_TARGET_LAYERING));

        assertTrue(mDisplayContent.shouldImeAttachedToApp());



        verify(mDisplayContent, atLeast(1)).attachAndShowImeScreenshotOnTarget();

        verify(mDisplayContent, atLeast(1)).showImeScreenshot();

        verify(mWm.mTaskSnapshotController).snapshotImeFromAttachedTask(appWin1.getTask());

        assertNotNull(mDisplayContent.mImeScreenshot);

        verify(t).show(mDisplayContent.mImeScreenshot);

    }



    @UseTestDisplay(addWindows = {W_INPUT_METHOD}, addAllCommonWindows = true)

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

+5 −1
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ import static org.mockito.Mockito.mock; 


import android.view.SurfaceControl;



import org.mockito.Mockito;



/**

 * Stubbed {@link SurfaceControl.Builder} class that returns a mocked SurfaceControl instance

 * that can be used for unit testing.
@@ -32,6 +34,8 @@ class MockSurfaceControlBuilder extends SurfaceControl.Builder { 


    @Override

    public SurfaceControl build() {

        return mock(SurfaceControl.class);

        SurfaceControl mockSurfaceControl = mock(SurfaceControl.class);

        Mockito.doReturn(true).when(mockSurfaceControl).isValid();

        return mockSurfaceControl;

    }

}

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

+8 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.graphics.GraphicBuffer; 
import android.graphics.Matrix;

import android.graphics.Rect;

import android.graphics.Region;

import android.hardware.HardwareBuffer;

import android.os.IBinder;

import android.os.Parcel;

import android.view.InputWindowHandle;
@@ -281,6 +282,13 @@ public class StubTransaction extends SurfaceControl.Transaction { 
        return this;

    }



    @Override

    @NonNull

    public SurfaceControl.Transaction setBuffer(@NonNull SurfaceControl sc,

            @Nullable HardwareBuffer buffer) {

        return this;

    }



    @Override

    public SurfaceControl.Transaction setColorSpace(SurfaceControl sc, ColorSpace colorSpace) {

        return this;