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

Commit de55f500 authored by Prabir Pradhan's avatar Prabir Pradhan
Browse files

Move per-window-input-rotation compatibility logic to native code 

Per-window-input-rotation was initially implemented by removing all
information about display projection from the native input pipeline.
However, several parts of it, like PointerController, still need access
to display projection.

Rather than applying comatibility logic in InputManagerService, we
change the native code direclty to work in display space.

Doc: go/unrotate-input

Bug: 179274888
Test: manual
Change-Id: I8a7af9db739f690aa540af487979529631e148d9
parent a50984c3

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

+0 −47
Original line number Original line Diff line number Diff line
@@ -16,8 +16,6 @@ 




package com.android.server.input;

package com.android.server.input;





import static android.view.Surface.ROTATION_0;



import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.app.Notification;

import android.app.Notification;
@@ -40,7 +38,6 @@ import android.content.res.Resources.NotFoundException; 
import android.content.res.TypedArray;

import android.content.res.TypedArray;

import android.content.res.XmlResourceParser;

import android.content.res.XmlResourceParser;

import android.database.ContentObserver;

import android.database.ContentObserver;

import android.graphics.Point;

import android.graphics.Rect;

import android.graphics.Rect;

import android.hardware.display.DisplayManager;

import android.hardware.display.DisplayManager;

import android.hardware.display.DisplayViewport;

import android.hardware.display.DisplayViewport;
@@ -100,7 +97,6 @@ import android.view.InputDevice; 
import android.view.InputEvent;

import android.view.InputEvent;

import android.view.InputMonitor;

import android.view.InputMonitor;

import android.view.KeyEvent;

import android.view.KeyEvent;

import android.view.MotionEvent;

import android.view.PointerIcon;

import android.view.PointerIcon;

import android.view.Surface;

import android.view.Surface;

import android.view.VerifiedInputEvent;

import android.view.VerifiedInputEvent;
@@ -595,20 +591,9 @@ public class InputManagerService extends IInputManager.Stub 




    private void setDisplayViewportsInternal(List<DisplayViewport> viewports) {

    private void setDisplayViewportsInternal(List<DisplayViewport> viewports) {

        final DisplayViewport[] vArray = new DisplayViewport[viewports.size()];

        final DisplayViewport[] vArray = new DisplayViewport[viewports.size()];

        if (ENABLE_PER_WINDOW_INPUT_ROTATION) {

            // Remove display projection information from DisplayViewport, leaving only the

            // orientation. The display projection will be built-into the window transforms.

            for (int i = viewports.size() - 1; i >= 0; --i) {

                final DisplayViewport v = vArray[i] = viewports.get(i).makeCopy();

                // Note: the deviceWidth/Height are in rotated with the orientation.

                v.logicalFrame.set(0, 0, v.deviceWidth, v.deviceHeight);

                v.physicalFrame.set(0, 0, v.deviceWidth, v.deviceHeight);

            }

        } else {

            for (int i = viewports.size() - 1; i >= 0; --i) {

            for (int i = viewports.size() - 1; i >= 0; --i) {

                vArray[i] = viewports.get(i);

                vArray[i] = viewports.get(i);

            }

            }

        }

        nativeSetDisplayViewports(mPtr, vArray);

        nativeSetDisplayViewports(mPtr, vArray);

    }

    }
@@ -828,38 +813,6 @@ public class InputManagerService extends IInputManager.Stub 
                && mode != InputEventInjectionSync.WAIT_FOR_RESULT) {

                && mode != InputEventInjectionSync.WAIT_FOR_RESULT) {

            throw new IllegalArgumentException("mode is invalid");

            throw new IllegalArgumentException("mode is invalid");

        }

        }

        if (ENABLE_PER_WINDOW_INPUT_ROTATION) {

            // Motion events that are pointer events or relative mouse events will need to have the

            // inverse display rotation applied to them.

            if (event instanceof MotionEvent

                    && (event.isFromSource(InputDevice.SOURCE_CLASS_POINTER)

                    || event.isFromSource(InputDevice.SOURCE_MOUSE_RELATIVE))) {

                Context displayContext = getContextForDisplay(event.getDisplayId());

                if (displayContext == null) {

                    displayContext = Objects.requireNonNull(

                            getContextForDisplay(Display.DEFAULT_DISPLAY));

                }

                final Display display = displayContext.getDisplay();

                final int rotation = display.getRotation();

                if (rotation != ROTATION_0) {

                    final MotionEvent motion = (MotionEvent) event;

                    // Injections are currently expected to be in the space of the injector (ie.

                    // usually assumed to be post-rotated). Thus we need to un-rotate into raw

                    // input coordinates for dispatch.

                    final Point sz = new Point();

                    if (event.isFromSource(InputDevice.SOURCE_CLASS_POINTER)) {

                        display.getRealSize(sz);

                        if ((rotation % 2) != 0) {

                            final int tmpX = sz.x;

                            sz.x = sz.y;

                            sz.y = tmpX;

                        }

                    }

                    motion.applyTransform(MotionEvent.createRotateMatrix(

                            (4 - rotation), sz.x, sz.y));

                }

            }

        }





        final int pid = Binder.getCallingPid();

        final int pid = Binder.getCallingPid();

        final int uid = Binder.getCallingUid();

        final int uid = Binder.getCallingUid();