| commit | 4b8025f5c460659d53c5e7cde66b0264ee7e8e6b | [log] [tgz] |
|---|---|---|
| author | Evan Rosky <erosky@google.com> | Wed May 12 03:25:19 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed May 12 03:25:19 2021 +0000 |
| tree | 248ffd108fed31411843bc21f248e9ba5291d5fa | |
| parent | 92e6deb1204b990c15bc7367a5dd5d254973191a [diff] | |
| parent | 937371bfb3eb2fe8f5b9f6dd3bfd5ad57c98d50f [diff] |
Merge "Revert "Fix a bug in TouchInteractionService for fixed-display input rotation"" into sc-dev am: 937371bfb3 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14490408 Change-Id: Ic57237eadcfdc575812a49875c1b9f9fffa0b233
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java index 027dd1c..edc7a3c 100644 --- a/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -534,13 +534,6 @@ 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)); } }