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

Commit 0426a336 authored by Tiger Huang's avatar Tiger Huang
Browse files

Update controls after addToDisplay/relayout before dispatching insets 

A window might request to control insets before it is added to WM and
expect the first dispatched WindowInsets as requested.

The first insets state returned from addToDisplay or relayout might be
not expected if the window just become thecontrol target in the
function.

With this CL, WM can return controls from addToDisplay and relayout, so
that the client can apply controls immediately, and update controlled
insets sources before dispatching the insets to the view hierarchy. This
enaures the insets dispatched are up-to-date.

Fix: 150756571
Test: atest WindowInsetsControllerTests RelayoutPerfTest
            WindowAddRemovePerfTest
Change-Id: Ib78c24beb7af5a54ad78935c3ddb260ef9645212
parent 9cea19d8

apct-tests/perftests/core/src/android/wm/RelayoutPerfTest.java

+3 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.util.MergedConfiguration; 
import android.view.DisplayCutout;

import android.view.IWindow;

import android.view.IWindowSession;

import android.view.InsetsSourceControl;

import android.view.InsetsState;

import android.view.SurfaceControl;

import android.view.View;
@@ -120,6 +121,7 @@ public class RelayoutPerfTest extends WindowManagerPerfTestBase { 
                new DisplayCutout.ParcelableWrapper(DisplayCutout.NO_CUTOUT);

        final MergedConfiguration mOutMergedConfiguration = new MergedConfiguration();

        final InsetsState mOutInsetsState = new InsetsState();

        final InsetsSourceControl[] mOutControls = new InsetsSourceControl[0];

        final IWindow mWindow;

        final View mView;

        final WindowManager.LayoutParams mParams;
@@ -152,7 +154,7 @@ public class RelayoutPerfTest extends WindowManagerPerfTestBase { 
                        mViewVisibility.getAsInt(), mFlags, mFrameNumber, mOutFrame,

                        mOutContentInsets, mOutVisibleInsets, mOutStableInsets,

                        mOutBackDropFrame, mOutDisplayCutout, mOutMergedConfiguration,

                        mOutSurfaceControl, mOutInsetsState, mOutSurfaceSize,

                        mOutSurfaceControl, mOutInsetsState, mOutControls, mOutSurfaceSize,

                        mOutBlastSurfaceControl);

            }

        }

apct-tests/perftests/core/src/android/wm/WindowAddRemovePerfTest.java

+3 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.view.Display; 
import android.view.DisplayCutout;

import android.view.IWindowSession;

import android.view.InputChannel;

import android.view.InsetsSourceControl;

import android.view.InsetsState;

import android.view.View;

import android.view.WindowManager;
@@ -91,6 +92,7 @@ public class WindowAddRemovePerfTest extends WindowManagerPerfTestBase 
        final DisplayCutout.ParcelableWrapper mOutDisplayCutout =

                new DisplayCutout.ParcelableWrapper();

        final InsetsState mOutInsetsState = new InsetsState();

        final InsetsSourceControl[] mOutControls = new InsetsSourceControl[0];



        TestWindow() {

            mLayoutParams.setTitle(TestWindow.class.getName());
@@ -109,7 +111,7 @@ public class WindowAddRemovePerfTest extends WindowManagerPerfTestBase 
                long startTime = SystemClock.elapsedRealtimeNanos();

                session.addToDisplay(this, mSeq, mLayoutParams, View.VISIBLE,

                        Display.DEFAULT_DISPLAY, mOutFrame, mOutContentInsets, mOutStableInsets,

                        mOutDisplayCutout, inputChannel, mOutInsetsState);

                        mOutDisplayCutout, inputChannel, mOutInsetsState, mOutControls);

                final long elapsedTimeNsOfAdd = SystemClock.elapsedRealtimeNanos() - startTime;

                state.addExtraResult("add", elapsedTimeNsOfAdd);

core/java/android/service/wallpaper/WallpaperService.java

+4 −2
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ import android.view.InputChannel; 
import android.view.InputDevice;

import android.view.InputEvent;

import android.view.InputEventReceiver;

import android.view.InsetsSourceControl;

import android.view.InsetsState;

import android.view.MotionEvent;

import android.view.SurfaceControl;
@@ -190,6 +191,7 @@ public abstract class WallpaperService extends Service { 
                new DisplayCutout.ParcelableWrapper();

        DisplayCutout mDispatchedDisplayCutout = DisplayCutout.NO_CUTOUT;

        final InsetsState mInsetsState = new InsetsState();

        final InsetsSourceControl[] mTempControls = new InsetsSourceControl[0];

        final MergedConfiguration mMergedConfiguration = new MergedConfiguration();

        private final Point mSurfaceSize = new Point();
@@ -878,7 +880,7 @@ public abstract class WallpaperService extends Service { 
                        if (mSession.addToDisplay(mWindow, mWindow.mSeq, mLayout, View.VISIBLE,

                                mDisplay.getDisplayId(), mWinFrame, mContentInsets, mStableInsets,

                                mDisplayCutout, inputChannel,

                                mInsetsState) < 0) {

                                mInsetsState, mTempControls) < 0) {

                            Log.w(TAG, "Failed to add window while updating wallpaper surface.");

                            return;

                        }
@@ -903,7 +905,7 @@ public abstract class WallpaperService extends Service { 
                            View.VISIBLE, 0, -1, mWinFrame, mContentInsets,

                            mVisibleInsets, mStableInsets, mBackdropFrame,

                            mDisplayCutout, mMergedConfiguration, mSurfaceControl,

                            mInsetsState, mSurfaceSize, mTmpSurfaceControl);

                            mInsetsState, mTempControls, mSurfaceSize, mTmpSurfaceControl);

                    if (mSurfaceControl.isValid()) {

                        mSurfaceHolder.mSurface.copyFrom(mSurfaceControl);

                        mSurfaceControl.release();

core/java/android/view/IWindowSession.aidl

+4 −3
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.view.IWindow; 
import android.view.IWindowId;

import android.view.MotionEvent;

import android.view.WindowManager;

import android.view.InsetsSourceControl;

import android.view.InsetsState;

import android.view.Surface;

import android.view.SurfaceControl;
@@ -46,7 +47,7 @@ interface IWindowSession { 
            in int viewVisibility, in int layerStackId, out Rect outFrame,

            out Rect outContentInsets, out Rect outStableInsets,

            out DisplayCutout.ParcelableWrapper displayCutout, out InputChannel outInputChannel,

            out InsetsState insetsState);

            out InsetsState insetsState, out InsetsSourceControl[] activeControls);

    int addToDisplayWithoutInputChannel(IWindow window, int seq, in WindowManager.LayoutParams attrs,

            in int viewVisibility, in int layerStackId, out Rect outContentInsets,

            out Rect outStableInsets, out InsetsState insetsState);
@@ -106,8 +107,8 @@ interface IWindowSession { 
            out Rect outBackdropFrame,

            out DisplayCutout.ParcelableWrapper displayCutout,

            out MergedConfiguration outMergedConfiguration, out SurfaceControl outSurfaceControl,

            out InsetsState insetsState, out Point outSurfaceSize,

            out SurfaceControl outBlastSurfaceControl);

            out InsetsState insetsState, out InsetsSourceControl[] activeControls,

            out Point outSurfaceSize, out SurfaceControl outBlastSurfaceControl);



    /*

     * Notify the window manager that an application is relaunching and

core/java/android/view/ViewRootImpl.java

+7 −3
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.view.Display.INVALID_DISPLAY; 
import static android.view.InputDevice.SOURCE_CLASS_NONE;

import static android.view.InsetsState.ITYPE_NAVIGATION_BAR;

import static android.view.InsetsState.ITYPE_STATUS_BAR;

import static android.view.InsetsState.LAST_TYPE;

import static android.view.View.PFLAG_DRAW_ANIMATION;

import static android.view.View.SYSTEM_UI_FLAG_FULLSCREEN;

import static android.view.View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
@@ -558,7 +559,8 @@ public final class ViewRootImpl implements ViewParent, 
    final DisplayCutout.ParcelableWrapper mPendingDisplayCutout =

            new DisplayCutout.ParcelableWrapper(DisplayCutout.NO_CUTOUT);

    boolean mPendingAlwaysConsumeSystemBars;

    private InsetsState mTempInsets = new InsetsState();

    private final InsetsState mTempInsets = new InsetsState();

    private final InsetsSourceControl[] mTempControls = new InsetsSourceControl[LAST_TYPE + 1];

    final ViewTreeObserver.InternalInsetsInfo mLastGivenInsets

            = new ViewTreeObserver.InternalInsetsInfo();
@@ -995,7 +997,7 @@ public final class ViewRootImpl implements ViewParent, 
                            getHostVisibility(), mDisplay.getDisplayId(), mTmpFrame,

                            mAttachInfo.mContentInsets, mAttachInfo.mStableInsets,

                            mAttachInfo.mDisplayCutout, inputChannel,

                            mTempInsets);

                            mTempInsets, mTempControls);

                    setFrame(mTmpFrame);

                } catch (RemoteException e) {

                    mAdded = false;
@@ -1020,6 +1022,7 @@ public final class ViewRootImpl implements ViewParent, 
                        (res & WindowManagerGlobal.ADD_FLAG_ALWAYS_CONSUME_SYSTEM_BARS) != 0;

                mPendingAlwaysConsumeSystemBars = mAttachInfo.mAlwaysConsumeSystemBars;

                mInsetsController.onStateChanged(mTempInsets);

                mInsetsController.onControlsChanged(mTempControls);

                if (DEBUG_LAYOUT) Log.v(mTag, "Added window " + mWindow);

                if (res < WindowManagerGlobal.ADD_OKAY) {

                    mAttachInfo.mRootView = null;
@@ -7348,7 +7351,7 @@ public final class ViewRootImpl implements ViewParent, 
                insetsPending ? WindowManagerGlobal.RELAYOUT_INSETS_PENDING : 0, frameNumber,

                mTmpFrame, mTmpRect, mTmpRect, mTmpRect, mPendingBackDropFrame,

                mPendingDisplayCutout, mPendingMergedConfiguration, mSurfaceControl, mTempInsets,

                mSurfaceSize, mBlastSurfaceControl);

                mTempControls, mSurfaceSize, mBlastSurfaceControl);

        if (mSurfaceControl.isValid()) {

            if (!mUseBLASTAdapter) {

                mSurface.copyFrom(mSurfaceControl);
@@ -7378,6 +7381,7 @@ public final class ViewRootImpl implements ViewParent, 
        }

        setFrame(mTmpFrame);

        mInsetsController.onStateChanged(mTempInsets);

        mInsetsController.onControlsChanged(mTempControls);

        return relayoutResult;

    }