From 5c3d37b37d2faf961c2ea3697d7bf5682f4f8550 Mon Sep 17 00:00:00 2001 From: "[1;3C" Date: Fri, 29 Jan 2021 18:20:52 -0800 Subject: [PATCH] Update input-monitors to accept unrotated coordinates Inputflinger now internally always works in the orientation the display grew-up in so the coordinates of gesture-monitors no-longer rotate to match the display. For now, this adds some shims to achieve previous expected coordinates in launcher This is behind a flag: adb shell setprop persist.debug.per_window_input_rotation 1 Bug: 179274888 Test: use touch interactions on rotated display Change-Id: Iecd9d233f60b86e24070d7d9055af6b8f44f0b54 --- .../quickstep/TouchInteractionService.java | 21 +++++++++++++++++++ .../OtherActivityInputConsumer.java | 19 +++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java index 8ebea33e72..c6c942ab28 100644 --- a/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java @@ -38,18 +38,23 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.content.res.Configuration; +import android.graphics.Point; import android.graphics.Rect; import android.graphics.Region; import android.graphics.drawable.Icon; +import android.hardware.display.DisplayManager; import android.os.Build; import android.os.Bundle; import android.os.IBinder; import android.os.Looper; import android.os.SystemClock; +import android.os.SystemProperties; import android.util.Log; import android.view.Choreographer; +import android.view.Display; import android.view.InputEvent; import android.view.MotionEvent; +import android.view.Surface; import android.view.accessibility.AccessibilityManager; import androidx.annotation.BinderThread; @@ -92,6 +97,7 @@ import com.android.systemui.plugins.PluginListener; import com.android.systemui.shared.recents.IOverviewProxy; import com.android.systemui.shared.recents.ISystemUiProxy; import com.android.systemui.shared.system.ActivityManagerWrapper; +import com.android.systemui.shared.system.InputChannelCompat; import com.android.systemui.shared.system.InputChannelCompat.InputEventReceiver; import com.android.systemui.shared.system.InputConsumerController; import com.android.systemui.shared.system.InputMonitorCompat; @@ -122,6 +128,9 @@ public class TouchInteractionService extends Service implements PluginListener { ActivityManagerWrapper.getInstance().cancelRecentsAnimation( @@ -172,6 +179,7 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC mPassedPilferInputSlop = mPassedWindowMoveSlop = continuingPreviousGesture; mDisableHorizontalSwipe = !mPassedPilferInputSlop && disableHorizontalSwipe; mRotationTouchHelper = mDeviceState.getRotationTouchHelper(); + mDisplayManager = getSystemService(DisplayManager.class); } @Override @@ -197,6 +205,17 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC return; } + if (TouchInteractionService.ENABLE_PER_WINDOW_INPUT_ROTATION) { + final Display display = mDisplayManager.getDisplay(mDeviceState.getDisplayId()); + final int rotation = display.getRotation(); + if (rotation != mLastRotation) { + // If rotation changes, reset tracking to avoid degenerate velocities. + mLastPos.set(ev.getX(), ev.getY()); + mVelocityTracker.clear(); + mLastRotation = rotation; + } + } + // Proxy events to recents view if (mPassedWindowMoveSlop && mInteractionHandler != null && !mRecentsViewDispatcher.hasConsumer()) {