| commit | c2e15821fd54e5d5badf00cc4ebe3af0c46b706d | [log] [tgz] |
|---|---|---|
| author | Evan Rosky <erosky@google.com> | Wed May 12 03:42:36 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed May 12 03:42:36 2021 +0000 |
| tree | 248ffd108fed31411843bc21f248e9ba5291d5fa | |
| parent | 3541c9a67688c691e648e811d645ba140e5d320a [diff] | |
| parent | 07985c400b138601f1fb4b84947562214bb6d993 [diff] |
Merge "Revert "Fix a bug in TouchInteractionService for fixed-display input rotation"" into sc-dev am: 937371bfb3 am: 07985c400b Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14490408 Change-Id: Ia944c1718939e2555624ceb40107944c2d361703
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)); } }