From 8e735c82345708071ee0a58990e3e09419ea152a Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Thu, 14 Sep 2023 05:24:07 +0000 Subject: [PATCH] Add some gesture logs - Log when a DelegateInputConsumer becomes active - Add reason for NavHandleLongPressInputConsumer - Fixed typo Test: adb shell dumpsys activity service TouchInteractionService locally and verify logs Flag: ENABLE_LONG_PRESS_NAV_HANDLE Bug: 300247322 Change-Id: Ie2cdc8f4bfc8a6c794536871e714ff913f36f46f --- .../com/android/quickstep/TouchInteractionService.java | 7 ++++++- .../inputconsumers/AccessibilityInputConsumer.java | 5 +++++ .../quickstep/inputconsumers/AssistantInputConsumer.java | 5 +++++ .../quickstep/inputconsumers/DelegateInputConsumer.java | 9 +++++++++ .../inputconsumers/NavHandleLongPressInputConsumer.java | 5 +++++ .../inputconsumers/OneHandedModeInputConsumer.java | 5 +++++ .../inputconsumers/TaskbarUnstashInputConsumer.java | 5 +++++ .../inputconsumers/TrackpadStatusBarInputConsumer.java | 5 +++++ 8 files changed, 45 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java index c1680de1b3..3be04edccd 100644 --- a/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java @@ -890,7 +890,7 @@ public class TouchInteractionService extends Service { } if (mDeviceState.isFullyGesturalNavMode() || newGestureState.isTrackpadGesture()) { String reasonPrefix = "device is in gesture navigation mode or 3-button mode with a" - + "trackpad gesture"; + + " trackpad gesture"; if (mDeviceState.canTriggerAssistantAction(event)) { reasonString.append(NEWLINE_PREFIX) .append(reasonPrefix) @@ -918,6 +918,11 @@ public class TouchInteractionService extends Service { } } else if (canStartSystemGesture && FeatureFlags.ENABLE_LONG_PRESS_NAV_HANDLE.get() && !previousGestureState.isRecentsAnimationRunning()) { + reasonString.append(NEWLINE_PREFIX) + .append(reasonPrefix) + .append(SUBSTRING_PREFIX) + .append("Long press nav handle enabled, " + + "using NavHandleLongPressInputConsumer"); base = new NavHandleLongPressInputConsumer(this, base, mInputMonitorCompat); } diff --git a/quickstep/src/com/android/quickstep/inputconsumers/AccessibilityInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/AccessibilityInputConsumer.java index 2abc7babe7..ec6efcb440 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/AccessibilityInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/AccessibilityInputConsumer.java @@ -152,4 +152,9 @@ public class AccessibilityInputConsumer extends DelegateInputConsumer { mDelegate.onMotionEvent(ev); } } + + @Override + protected String getDelegatorName() { + return "AccessibilityInputConsumer"; + } } diff --git a/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java index a209b3b435..ba012c9b64 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java @@ -278,4 +278,9 @@ public class AssistantInputConsumer extends DelegateInputConsumer { return true; } } + + @Override + protected String getDelegatorName() { + return "AssistantInputConsumer"; + } } diff --git a/quickstep/src/com/android/quickstep/inputconsumers/DelegateInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/DelegateInputConsumer.java index 858999e40e..63771f0d56 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/DelegateInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/DelegateInputConsumer.java @@ -5,6 +5,7 @@ import android.view.MotionEvent; import com.android.launcher3.testing.TestLogging; import com.android.launcher3.testing.shared.TestProtocol; import com.android.quickstep.InputConsumer; +import com.android.quickstep.util.ActiveGestureLog; import com.android.systemui.shared.system.InputMonitorCompat; public abstract class DelegateInputConsumer implements InputConsumer { @@ -42,7 +43,15 @@ public abstract class DelegateInputConsumer implements InputConsumer { mDelegate.onConsumerAboutToBeSwitched(); } + /** + * Returns the name of this DelegateInputConsumer. + */ + protected abstract String getDelegatorName(); + protected void setActive(MotionEvent ev) { + ActiveGestureLog.INSTANCE.addLog(new ActiveGestureLog.CompoundString(getDelegatorName()) + .append(" became active")); + mState = STATE_ACTIVE; TestLogging.recordEvent(TestProtocol.SEQUENCE_PILFER, "pilferPointers"); mInputMonitor.pilferPointers(); diff --git a/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java index a9accb7bf7..8d778416e0 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java @@ -78,4 +78,9 @@ public class NavHandleLongPressInputConsumer extends DelegateInputConsumer { return distFromMiddle < areaFromMiddle; } + + @Override + protected String getDelegatorName() { + return "NavHandleLongPressInputConsumer"; + } } diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java index 5387c8a852..83b556dc1b 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/OneHandedModeInputConsumer.java @@ -175,4 +175,9 @@ public class OneHandedModeInputConsumer extends DelegateInputConsumer { final float angle = (float) Math.toDegrees(Math.atan2(deltaY, deltaX)); return angle > ANGLE_MIN && angle < ANGLE_MAX; } + + @Override + protected String getDelegatorName() { + return "OneHandedModeInputConsumer"; + } } diff --git a/quickstep/src/com/android/quickstep/inputconsumers/TaskbarUnstashInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/TaskbarUnstashInputConsumer.java index 0e90e504d0..28ac65b721 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/TaskbarUnstashInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/TaskbarUnstashInputConsumer.java @@ -346,4 +346,9 @@ public class TaskbarUnstashInputConsumer extends DelegateInputConsumer { private boolean isMouseEvent(MotionEvent event) { return event.getSource() == InputDevice.SOURCE_MOUSE; } + + @Override + protected String getDelegatorName() { + return "TaskbarUnstashInputConsumer"; + } } diff --git a/quickstep/src/com/android/quickstep/inputconsumers/TrackpadStatusBarInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/TrackpadStatusBarInputConsumer.java index 7ff99828c5..f3e21e1399 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/TrackpadStatusBarInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/TrackpadStatusBarInputConsumer.java @@ -82,4 +82,9 @@ public class TrackpadStatusBarInputConsumer extends DelegateInputConsumer { mSystemUiProxy.onStatusBarTrackpadEvent(ev); } } + + @Override + protected String getDelegatorName() { + return "TrackpadStatusBarInputConsumer"; + } }