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

Commit bedb50ed authored by Vaibhav Devmurari's avatar Vaibhav Devmurari Committed by Android (Google) Code Review
Browse files

Merge "Revert change "Change Rounded corner overlay to be in Overlay layer" Revert CL ag/18494304"

parents d360900b f62e0013

services/core/java/com/android/server/input/GestureMonitorSpyWindow.java

+1 −5
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ import android.view.InputWindowHandle; 
import android.view.SurfaceControl;

import android.view.WindowManager;



import com.android.server.policy.WindowManagerPolicy;



/**

 * An internal implementation of an {@link InputMonitor} that uses a spy window.

 *
@@ -69,9 +67,7 @@ class GestureMonitorSpyWindow { 


        final SurfaceControl.Transaction t = new SurfaceControl.Transaction();

        t.setInputWindowInfo(mInputSurface, mWindowHandle);

        // Gesture monitor should be above handwriting event surface, hence setting it to

        // WindowManagerPolicy.INPUT_DISPLAY_OVERLAY_LAYER + 1

        t.setLayer(mInputSurface, WindowManagerPolicy.INPUT_DISPLAY_OVERLAY_LAYER + 1);

        t.setLayer(mInputSurface, Integer.MAX_VALUE);

        t.setPosition(mInputSurface, 0, 0);

        t.setCrop(mInputSurface, null /* crop to parent surface */);

        t.show(mInputSurface);

services/core/java/com/android/server/inputmethod/HandwritingEventReceiverSurface.java

+1 −4
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ import android.view.InputWindowHandle; 
import android.view.SurfaceControl;

import android.view.WindowManager;



import com.android.server.policy.WindowManagerPolicy;



final class HandwritingEventReceiverSurface {



    public static final String TAG = HandwritingEventReceiverSurface.class.getSimpleName();
@@ -38,8 +36,7 @@ final class HandwritingEventReceiverSurface { 
    // is above gesture monitors, then edge-back and swipe-up gestures won't work when this surface

    // is intercepting.

    // TODO(b/217538817): Specify the ordering in WM by usage.

    private static final int HANDWRITING_SURFACE_LAYER =

            WindowManagerPolicy.INPUT_DISPLAY_OVERLAY_LAYER;

    private static final int HANDWRITING_SURFACE_LAYER = Integer.MAX_VALUE - 1;



    private final InputWindowHandle mWindowHandle;

    private final InputChannel mClientChannel;

services/core/java/com/android/server/policy/WindowManagerPolicy.java

+0 −4
Original line number Diff line number Diff line
@@ -155,10 +155,6 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants { 
    int FINISH_LAYOUT_REDO_ANIM = 0x0008;

    /** Layer for the screen off animation */

    int COLOR_FADE_LAYER = 0x40000001;

    /** Layer for Input overlays for capturing inputs for gesture detection, etc. */

    int INPUT_DISPLAY_OVERLAY_LAYER = 0x7f000000;

    /** Layer for Screen Decoration: The top most visible layer just below input overlay layers */

    int SCREEN_DECOR_DISPLAY_OVERLAY_LAYER = INPUT_DISPLAY_OVERLAY_LAYER - 1;



    /**

     * Register shortcuts for window manager to dispatch.

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

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ final class InputManagerCallback implements InputManagerService.WindowManagerCal 
                    .setContainerLayer()

                    .setName(name)

                    .setCallsite("createSurfaceForGestureMonitor")

                    .setParent(dc.getOverlayLayer())

                    .setParent(dc.getSurfaceControl())

                    .build();

        }

    }

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

+0 −5
Original line number Diff line number Diff line
@@ -173,11 +173,6 @@ class ScreenRotationAnimation { 


            if (isSizeChanged) {

                mRoundedCornerOverlay = displayContent.findRoundedCornerOverlays();

            } else {

                // Exclude rounded corner overlay from screenshot buffer. Rounded

                // corner overlay windows are un-rotated during rotation animation

                // for a seamless transition.

                builder.setExcludeLayers(displayContent.findRoundedCornerOverlays());

            }



            SurfaceControl.ScreenshotHardwareBuffer screenshotBuffer =