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

Commit bc1d8093 authored by Tiger Huang's avatar Tiger Huang
Browse files

Send InsetsState to the client via IWindow#resized 

In some cases, the InsetsState and the window frame can be changed at
the same time (such as orientation changed). Reporting them separately
might produce incorrect insets.

When the window layout is moved to the client, it uses the configuration
and the InsetsState to compute the window frame. They need to be
reported together as well.

Bug: 161810301
Bug: 160732586
Test: atest ActivityRecordTests WindowStateTests
Test: Add logs to check if we dispatch the correct insets to apps while
      rotating the display.
Change-Id: I5c9f628eda40932def97c5caf968cb62db128e80
parent bb497479

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

+3 −2
Original line number Diff line number Diff line
@@ -395,8 +395,9 @@ public abstract class WallpaperService extends Service { 
        final BaseIWindow mWindow = new BaseIWindow() {

            @Override

            public void resized(ClientWindowFrames frames, boolean reportDraw,

                    MergedConfiguration mergedConfiguration, boolean forceLayout,

                    boolean alwaysConsumeSystemBars, int displayId, int syncSeqId, int resizeMode) {

                    MergedConfiguration mergedConfiguration, InsetsState insetsState,

                    boolean forceLayout, boolean alwaysConsumeSystemBars, int displayId,

                    int syncSeqId, int resizeMode) {

                Message msg = mCaller.obtainMessageIO(MSG_WINDOW_RESIZED,

                        reportDraw ? 1 : 0,

                        mergedConfiguration);

core/java/android/view/IWindow.aidl

+2 −14
Original line number Diff line number Diff line
@@ -54,26 +54,14 @@ oneway interface IWindow { 
    void executeCommand(String command, String parameters, in ParcelFileDescriptor descriptor);



    void resized(in ClientWindowFrames frames, boolean reportDraw,

            in MergedConfiguration newMergedConfiguration,

            in MergedConfiguration newMergedConfiguration, in InsetsState insetsState,

            boolean forceLayout, boolean alwaysConsumeSystemBars, int displayId,

            int syncSeqId, int resizeMode);



    /**

     * Called when the window insets configuration has changed.

     *

     * @param willMove The window frame will be moved soon.

     * @param willResize The window frame will be resized soon.

     */

    void insetsChanged(in InsetsState insetsState, in boolean willMove, in boolean willResize);



    /**

     * Called when this window retrieved control over a specified set of insets sources.

     *

     * @param willMove The window frame will be moved soon.

     * @param willResize The window frame will be resized soon.

     */

    void insetsControlChanged(in InsetsState insetsState, in InsetsSourceControl[] activeControls,

            in boolean willMove, in boolean willResize);

    void insetsControlChanged(in InsetsState insetsState, in InsetsSourceControl[] activeControls);



    /**

     * Called when a set of insets source window should be shown by policy.

core/java/android/view/ViewRootImpl.java

+29 −72
Original line number Diff line number Diff line
@@ -680,9 +680,6 @@ public final class ViewRootImpl implements ViewParent, 


    final Rect mPendingBackDropFrame = new Rect();



    private boolean mWillMove;

    private boolean mWillResize;



    boolean mPendingAlwaysConsumeSystemBars;

    private final InsetsState mTempInsets = new InsetsState();

    private final InsetsSourceControl[] mTempControls = new InsetsSourceControl[SIZE];
@@ -1872,10 +1869,6 @@ public final class ViewRootImpl implements ViewParent, 


    void notifyInsetsChanged() {

        mApplyInsetsRequested = true;

        if (mWillMove || mWillResize) {

            // The window frame will be changed soon. The following logic will be executed then.

            return;

        }

        requestLayout();



        // See comment for View.sForceLayoutWhenInsetsChanged
@@ -2778,7 +2771,7 @@ public final class ViewRootImpl implements ViewParent, 
        // Execute enqueued actions on every traversal in case a detached view enqueued an action

        getRunQueue().executeActions(mAttachInfo.mHandler);



        if (mApplyInsetsRequested && !(mWillMove || mWillResize)) {

        if (mApplyInsetsRequested) {

            dispatchApplyInsets(host);

        }
@@ -5338,14 +5331,13 @@ public final class ViewRootImpl implements ViewParent, 
    private static final int MSG_REQUEST_KEYBOARD_SHORTCUTS = 26;

    private static final int MSG_UPDATE_POINTER_ICON = 27;

    private static final int MSG_POINTER_CAPTURE_CHANGED = 28;

    private static final int MSG_INSETS_CHANGED = 30;

    private static final int MSG_INSETS_CONTROL_CHANGED = 31;

    private static final int MSG_SYSTEM_GESTURE_EXCLUSION_CHANGED = 32;

    private static final int MSG_SHOW_INSETS = 34;

    private static final int MSG_HIDE_INSETS = 35;

    private static final int MSG_REQUEST_SCROLL_CAPTURE = 36;

    private static final int MSG_WINDOW_TOUCH_MODE_CHANGED = 37;

    private static final int MSG_KEEP_CLEAR_RECTS_CHANGED = 38;

    private static final int MSG_INSETS_CONTROL_CHANGED = 29;

    private static final int MSG_SYSTEM_GESTURE_EXCLUSION_CHANGED = 30;

    private static final int MSG_SHOW_INSETS = 31;

    private static final int MSG_HIDE_INSETS = 32;

    private static final int MSG_REQUEST_SCROLL_CAPTURE = 33;

    private static final int MSG_WINDOW_TOUCH_MODE_CHANGED = 34;

    private static final int MSG_KEEP_CLEAR_RECTS_CHANGED = 35;





    final class ViewRootHandler extends Handler {
@@ -5400,8 +5392,6 @@ public final class ViewRootImpl implements ViewParent, 
                    return "MSG_UPDATE_POINTER_ICON";

                case MSG_POINTER_CAPTURE_CHANGED:

                    return "MSG_POINTER_CAPTURE_CHANGED";

                case MSG_INSETS_CHANGED:

                    return "MSG_INSETS_CHANGED";

                case MSG_INSETS_CONTROL_CHANGED:

                    return "MSG_INSETS_CONTROL_CHANGED";

                case MSG_SYSTEM_GESTURE_EXCLUSION_CHANGED:
@@ -5463,25 +5453,14 @@ public final class ViewRootImpl implements ViewParent, 
                    break;

                case MSG_RESIZED:

                case MSG_RESIZED_REPORT: {

                    mWillMove = false;

                    mWillResize = false;

                    final SomeArgs args = (SomeArgs) msg.obj;

                    mInsetsController.onStateChanged((InsetsState) args.arg3);

                    handleResized(msg.what, args);

                    args.recycle();

                    break;

                }

                case MSG_INSETS_CHANGED: {

                    SomeArgs args = (SomeArgs) msg.obj;

                    mWillMove = args.argi1 == 1;

                    mWillResize = args.argi2 == 1;

                    mInsetsController.onStateChanged((InsetsState) args.arg1);

                    args.recycle();

                    break;

                }

                case MSG_INSETS_CONTROL_CHANGED: {

                    SomeArgs args = (SomeArgs) msg.obj;

                    mWillMove = args.argi1 == 1;

                    mWillResize = args.argi2 == 1;



                    // Deliver state change before control change, such that:

                    // a) When gaining control, controller can compare with server state to evaluate
@@ -5517,7 +5496,6 @@ public final class ViewRootImpl implements ViewParent, 
                    break;

                }

                case MSG_WINDOW_MOVED:

                    mWillMove = false;

                    if (mAdded) {

                        final int w = mWinFrame.width();

                        final int h = mWinFrame.height();
@@ -7983,8 +7961,6 @@ public final class ViewRootImpl implements ViewParent, 
        final int requestedWidth = (int) (mView.getMeasuredWidth() * appScale + 0.5f);

        final int requestedHeight = (int) (mView.getMeasuredHeight() * appScale + 0.5f);



        mWillMove = false;

        mWillResize = false;

        int relayoutResult = 0;

        WindowConfiguration winConfig = getConfiguration().windowConfiguration;

        if (LOCAL_LAYOUT) {
@@ -8529,15 +8505,25 @@ public final class ViewRootImpl implements ViewParent, 


    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    private void dispatchResized(ClientWindowFrames frames, boolean reportDraw,

            MergedConfiguration mergedConfiguration, boolean forceLayout,

            MergedConfiguration mergedConfiguration, InsetsState insetsState, boolean forceLayout,

            boolean alwaysConsumeSystemBars, int displayId, int syncSeqId, int resizeMode) {



        Message msg = mHandler.obtainMessage(reportDraw ? MSG_RESIZED_REPORT : MSG_RESIZED);

        SomeArgs args = SomeArgs.obtain();

        final boolean sameProcessCall = (Binder.getCallingPid() == android.os.Process.myPid());

        if (sameProcessCall) {

            insetsState = new InsetsState(insetsState, true /* copySource */);

        }

        if (mTranslator != null) {

            mTranslator.translateInsetsStateInScreenToAppWindow(insetsState);

        }

        if (insetsState.getSourceOrDefaultVisibility(ITYPE_IME)) {

            ImeTracing.getInstance().triggerClientDump("ViewRootImpl#dispatchResized",

                    getInsetsController().getHost().getInputMethodManager(), null /* icProto */);

        }

        args.arg1 = sameProcessCall ? new ClientWindowFrames(frames) : frames;

        args.arg2 = sameProcessCall && mergedConfiguration != null

                ? new MergedConfiguration(mergedConfiguration) : mergedConfiguration;

        args.arg3 = insetsState;

        args.argi1 = forceLayout ? 1 : 0;

        args.argi2 = alwaysConsumeSystemBars ? 1 : 0;

        args.argi3 = displayId;
@@ -8548,27 +8534,8 @@ public final class ViewRootImpl implements ViewParent, 
        mHandler.sendMessage(msg);

    }



    private void dispatchInsetsChanged(InsetsState insetsState, boolean willMove,

            boolean willResize) {

        if (Binder.getCallingPid() == android.os.Process.myPid()) {

            insetsState = new InsetsState(insetsState, true /* copySource */);

        }

        if (mTranslator != null) {

            mTranslator.translateInsetsStateInScreenToAppWindow(insetsState);

        }

        if (insetsState != null && insetsState.getSourceOrDefaultVisibility(ITYPE_IME)) {

            ImeTracing.getInstance().triggerClientDump("ViewRootImpl#dispatchInsetsChanged",

                    getInsetsController().getHost().getInputMethodManager(), null /* icProto */);

        }

        SomeArgs args = SomeArgs.obtain();

        args.arg1 = insetsState;

        args.argi1 = willMove ? 1 : 0;

        args.argi2 = willResize ? 1 : 0;

        mHandler.obtainMessage(MSG_INSETS_CHANGED, args).sendToTarget();

    }



    private void dispatchInsetsControlChanged(InsetsState insetsState,

            InsetsSourceControl[] activeControls, boolean willMove, boolean willResize) {

            InsetsSourceControl[] activeControls) {

        if (Binder.getCallingPid() == android.os.Process.myPid()) {

            insetsState = new InsetsState(insetsState, true /* copySource */);

            if (activeControls != null) {
@@ -8588,8 +8555,6 @@ public final class ViewRootImpl implements ViewParent, 
        SomeArgs args = SomeArgs.obtain();

        args.arg1 = insetsState;

        args.arg2 = activeControls;

        args.argi1 = willMove ? 1 : 0;

        args.argi2 = willResize ? 1 : 0;

        mHandler.obtainMessage(MSG_INSETS_CONTROL_CHANGED, args).sendToTarget();

    }
@@ -9932,30 +9897,22 @@ public final class ViewRootImpl implements ViewParent, 


        @Override

        public void resized(ClientWindowFrames frames, boolean reportDraw,

                MergedConfiguration mergedConfiguration, boolean forceLayout,

                boolean alwaysConsumeSystemBars, int displayId, int syncSeqId, int resizeMode) {

            final ViewRootImpl viewAncestor = mViewAncestor.get();

            if (viewAncestor != null) {

                viewAncestor.dispatchResized(frames, reportDraw, mergedConfiguration, forceLayout,

                        alwaysConsumeSystemBars, displayId, syncSeqId, resizeMode);

            }

        }



        @Override

        public void insetsChanged(InsetsState insetsState, boolean willMove, boolean willResize) {

                MergedConfiguration mergedConfiguration, InsetsState insetsState,

                boolean forceLayout, boolean alwaysConsumeSystemBars, int displayId, int syncSeqId,

                int resizeMode) {

            final ViewRootImpl viewAncestor = mViewAncestor.get();

            if (viewAncestor != null) {

                viewAncestor.dispatchInsetsChanged(insetsState, willMove, willResize);

                viewAncestor.dispatchResized(frames, reportDraw, mergedConfiguration, insetsState,

                        forceLayout, alwaysConsumeSystemBars, displayId, syncSeqId, resizeMode);

            }

        }



        @Override

        public void insetsControlChanged(InsetsState insetsState,

                InsetsSourceControl[] activeControls, boolean willMove, boolean willResize) {

                InsetsSourceControl[] activeControls) {

            final ViewRootImpl viewAncestor = mViewAncestor.get();

            if (viewAncestor != null) {

                viewAncestor.dispatchInsetsControlChanged(

                        insetsState, activeControls, willMove, willResize);

                viewAncestor.dispatchInsetsControlChanged(insetsState, activeControls);

            }

        }

core/java/android/view/WindowlessWindowManager.java

+10 −4
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.view;



import static android.view.WindowCallbacks.RESIZE_MODE_INVALID;



import android.annotation.Nullable;

import android.content.res.Configuration;

import android.graphics.PixelFormat;
@@ -82,9 +84,8 @@ public class WindowlessWindowManager implements IWindowSession { 
    private final IBinder mHostInputToken;

    private final IBinder mFocusGrantToken = new Binder();

    private InsetsState mInsetsState;



    private int mForceHeight = -1;

    private int mForceWidth = -1;

    private final ClientWindowFrames mTmpFrames = new ClientWindowFrames();

    private final MergedConfiguration mTmpConfig = new MergedConfiguration();



    public WindowlessWindowManager(Configuration c, SurfaceControl rootSurface,

            IBinder hostInputToken) {
@@ -540,7 +541,12 @@ public class WindowlessWindowManager implements IWindowSession { 
        mInsetsState = state;

        for (State s : mStateForWindow.values()) {

            try {

                s.mClient.insetsChanged(state, false, false);

                mTmpFrames.frame.set(0, 0, s.mParams.width, s.mParams.height);

                mTmpFrames.displayFrame.set(mTmpFrames.frame);

                mTmpConfig.setConfiguration(mConfiguration, mConfiguration);

                s.mClient.resized(mTmpFrames, false /* reportDraw */, mTmpConfig, state,

                        false /* forceLayout */, false /* alwaysConsumeSystemBars */, s.mDisplayId,

                        Integer.MAX_VALUE, RESIZE_MODE_INVALID);

            } catch (RemoteException e) {

                // Too bad

            }

core/java/com/android/internal/view/BaseIWindow.java

+2 −6
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ public class BaseIWindow extends IWindow.Stub { 


    @Override

    public void resized(ClientWindowFrames frames, boolean reportDraw,

            MergedConfiguration mergedConfiguration, boolean forceLayout,

            MergedConfiguration mergedConfiguration, InsetsState insetsState, boolean forceLayout,

            boolean alwaysConsumeSystemBars, int displayId, int seqId, int resizeMode) {

        if (reportDraw) {

            try {
@@ -60,13 +60,9 @@ public class BaseIWindow extends IWindow.Stub { 
        }

    }



    @Override

    public void insetsChanged(InsetsState insetsState, boolean willMove, boolean willResize) {

    }



    @Override

    public void insetsControlChanged(InsetsState insetsState,

            InsetsSourceControl[] activeControls, boolean willMove, boolean willResize) {

            InsetsSourceControl[] activeControls) {

    }



    @Override