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

Commit 3644df51 authored by Prabir Pradhan's avatar Prabir Pradhan
Browse files

Per-window input rotation: Remove projection from DisplayViewport 

InputFlinger always needs to know about the display orientation because
some devices (such as mice and touchpads) are orientation-dependent.

Instead of removing the orientation for DisplayViewport, we remove the
display projection so that the logical, physical, and device frames are
the same. The display projection will be included in the per-window
transform set by SurfaceFlinger.

Bug: 179274888
Test: test touch, mouse, and touchpad input in all four orientations
using a test app and the PointerLocationView.

Change-Id: I00481c67ee6dfa93115b299999ea7c0d4baa8e02
parent 5ef41d06

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

+3 −8
Original line number Diff line number Diff line
@@ -586,18 +586,13 @@ public class InputManagerService extends IInputManager.Stub 
    private void setDisplayViewportsInternal(List<DisplayViewport> viewports) {

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

        if (ENABLE_PER_WINDOW_INPUT_ROTATION) {

            // Remove all viewport operations. They will be built-into the window transforms.

            // 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();

                // deviceWidth/Height are apparently in "rotated" space, so flip them if needed.

                if (v.orientation % 2 != 0) {

                    final int dw = v.deviceWidth;

                    v.deviceWidth = v.deviceHeight;

                    v.deviceHeight = dw;

                }

                // 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);

                v.orientation = 0;

            }

        } else {

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