Merge "Fix a bug in TouchInteractionService for fixed-display input rotation" into sc-dev am: 6255fd20f8 am: a1837f7e34

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14429344 Change-Id: If07b35913d523805ca4c40c7c953feb3e922eeab
2021-05-06 01:04:01 +00:00
parent 0d74388f8a a1837f7e34
commit 728053e9bb
1 changed files with 7 additions and 0 deletions
@@ -496,6 +496,13 @@ public class TouchInteractionService extends Service implements PluginListener<O
            Point sz = new Point();
            display.getRealSize(sz);
            if (rotation != Surface.ROTATION_0) {
+                if ((rotation % 2) != 0) {
+                    // via display-manager, the display size is unrotated, so "rotate" its size
+                    // to match the rotation we are transforming the event into.
+                    final int tmpX = sz.x;
+                    sz.x = sz.y;
+                    sz.y = tmpX;
+                }
                event.transform(InputChannelCompat.createRotationMatrix(rotation, sz.x, sz.y));
            }
        }