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

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

Merge changes from topic "requestedVisibleTypes2"

* changes:
  Describe requested visibilities in public types (3/n: server side)
  Describe requested visibilities in public types (2/n: client-server)
  Describe requested visibilities in public types (1/n: client side)
parents f233145d ec584382
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ import android.view.IWindowSession;
import android.view.InputChannel;
import android.view.InsetsSourceControl;
import android.view.InsetsState;
import android.view.InsetsVisibilities;
import android.view.View;
import android.view.WindowInsets;
import android.view.WindowManager;
import android.view.WindowManagerGlobal;

@@ -84,7 +84,7 @@ public class WindowAddRemovePerfTest extends WindowManagerPerfTestBase

    private static class TestWindow extends BaseIWindow {
        final WindowManager.LayoutParams mLayoutParams = new WindowManager.LayoutParams();
        final InsetsVisibilities mRequestedVisibilities = new InsetsVisibilities();
        final int mRequestedVisibleTypes = WindowInsets.Type.defaultVisible();
        final InsetsState mOutInsetsState = new InsetsState();
        final InsetsSourceControl[] mOutControls = new InsetsSourceControl[0];
        final Rect mOutAttachedFrame = new Rect();
@@ -106,7 +106,7 @@ public class WindowAddRemovePerfTest extends WindowManagerPerfTestBase

                long startTime = SystemClock.elapsedRealtimeNanos();
                session.addToDisplay(this, mLayoutParams, View.VISIBLE,
                        Display.DEFAULT_DISPLAY, mRequestedVisibilities, inputChannel,
                        Display.DEFAULT_DISPLAY, mRequestedVisibleTypes, inputChannel,
                        mOutInsetsState, mOutControls, mOutAttachedFrame, mOutSizeCompatScale);
                final long elapsedTimeNsOfAdd = SystemClock.elapsedRealtimeNanos() - startTime;
                state.addExtraResult("add", elapsedTimeNsOfAdd);
+3 −4
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ import android.view.InputEvent;
import android.view.InputEventReceiver;
import android.view.InsetsSourceControl;
import android.view.InsetsState;
import android.view.InsetsVisibilities;
import android.view.MotionEvent;
import android.view.PixelCopy;
import android.view.Surface;
@@ -251,7 +250,6 @@ public abstract class WallpaperService extends Service {
        final Rect mDispatchedStableInsets = new Rect();
        DisplayCutout mDispatchedDisplayCutout = DisplayCutout.NO_CUTOUT;
        final InsetsState mInsetsState = new InsetsState();
        final InsetsVisibilities mRequestedVisibilities = new InsetsVisibilities();
        final InsetsSourceControl[] mTempControls = new InsetsSourceControl[0];
        final MergedConfiguration mMergedConfiguration = new MergedConfiguration();
        final Bundle mSyncSeqIdBundle = new Bundle();
@@ -1133,8 +1131,9 @@ public abstract class WallpaperService extends Service {
                        InputChannel inputChannel = new InputChannel();

                        if (mSession.addToDisplay(mWindow, mLayout, View.VISIBLE,
                                mDisplay.getDisplayId(), mRequestedVisibilities, inputChannel,
                                mInsetsState, mTempControls, new Rect(), new float[1]) < 0) {
                                mDisplay.getDisplayId(), WindowInsets.Type.defaultVisible(),
                                inputChannel, mInsetsState, mTempControls, new Rect(),
                                new float[1]) < 0) {
                            Log.w(TAG, "Failed to add window while updating wallpaper surface.");
                            return;
                        }
+2 −4
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package android.view;
import android.content.ComponentName;
import android.view.InsetsSourceControl;
import android.view.InsetsState;
import android.view.InsetsVisibilities;

/**
 * Singular controller of insets to use when there isn't another obvious controller available.
@@ -32,10 +31,9 @@ oneway interface IDisplayWindowInsetsController {
     * Called when top focused window changes to determine whether or not to take over insets
     * control. Won't be called if config_remoteInsetsControllerControlsSystemBars is false.
     * @param component: Passes the top application component in the focused window.
     * @param requestedVisibilities The insets visibilities requested by the focussed window.
     * @param requestedVisibleTypes The insets types requested visible by the focused window.
     */
    void topFocusedWindowChanged(in ComponentName component,
            in InsetsVisibilities insetsVisibilities);
    void topFocusedWindowChanged(in ComponentName component, int requestedVisibleTypes);

    /**
     * @see IWindow#insetsChanged
+1 −1
Original line number Diff line number Diff line
@@ -721,7 +721,7 @@ interface IWindowManager
     * Called when a remote process updates the requested visibilities of insets on a display window
     * container.
     */
    void updateDisplayWindowRequestedVisibilities(int displayId, in InsetsVisibilities vis);
    void updateDisplayWindowRequestedVisibleTypes(int displayId, int requestedVisibleTypes);

    /**
     * Called to get the expected window insets.
+7 −8
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import android.view.MotionEvent;
import android.view.WindowManager;
import android.view.InsetsSourceControl;
import android.view.InsetsState;
import android.view.InsetsVisibilities;
import android.view.Surface;
import android.view.SurfaceControl;
import android.view.SurfaceControl.Transaction;
@@ -48,15 +47,15 @@ import java.util.List;
 */
interface IWindowSession {
    int addToDisplay(IWindow window, in WindowManager.LayoutParams attrs,
            in int viewVisibility, in int layerStackId, in InsetsVisibilities requestedVisibilities,
            in int viewVisibility, in int layerStackId, int requestedVisibleTypes,
            out InputChannel outInputChannel, out InsetsState insetsState,
            out InsetsSourceControl[] activeControls, out Rect attachedFrame,
            out float[] sizeCompatScale);
    int addToDisplayAsUser(IWindow window, in WindowManager.LayoutParams attrs,
            in int viewVisibility, in int layerStackId, in int userId,
            in InsetsVisibilities requestedVisibilities, out InputChannel outInputChannel,
            out InsetsState insetsState, out InsetsSourceControl[] activeControls,
            out Rect attachedFrame, out float[] sizeCompatScale);
            in int viewVisibility, in int layerStackId, in int userId, int requestedVisibleTypes,
            out InputChannel outInputChannel, out InsetsState insetsState,
            out InsetsSourceControl[] activeControls, out Rect attachedFrame,
            out float[] sizeCompatScale);
    int addToDisplayWithoutInputChannel(IWindow window, in WindowManager.LayoutParams attrs,
            in int viewVisibility, in int layerStackId, out InsetsState insetsState,
            out Rect attachedFrame, out float[] sizeCompatScale);
@@ -279,9 +278,9 @@ interface IWindowSession {
    oneway void updateTapExcludeRegion(IWindow window, in Region region);

    /**
     * Updates the requested visibilities of insets.
     * Updates the requested visible types of insets.
     */
    oneway void updateRequestedVisibilities(IWindow window, in InsetsVisibilities visibilities);
    oneway void updateRequestedVisibleTypes(IWindow window, int requestedVisibleTypes);

    /**
     * Called when the system gesture exclusion has changed.
Loading