From 97270e803deb94b4cbd41cf744d33cc308d5b325 Mon Sep 17 00:00:00 2001 From: Ameer Armaly Date: Fri, 13 Nov 2020 08:29:02 -0800 Subject: [PATCH] Make AccessibilityGestureEvent.gestureIdToString public. This allows for better error reporting in tests and services. Bug: 159651900 Test: atest GestureManifoldTest TouchExplorerTest AccessibilityGestureDetectorTest FrameworksServicesTests:TouchExplorerTest Change-Id: Ic65ff7100ade77bbf26d538a033e9e000e6b9bcc --- core/api/current.txt | 1 + .../AccessibilityGestureEvent.java | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index 897db39d25dea..33907392b39fc 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -2856,6 +2856,7 @@ package android.accessibilityservice { public final class AccessibilityGestureEvent implements android.os.Parcelable { method public int describeContents(); + method @NonNull public static String gestureIdToString(int); method public int getDisplayId(); method public int getGestureId(); method @NonNull public java.util.List getMotionEvents(); diff --git a/core/java/android/accessibilityservice/AccessibilityGestureEvent.java b/core/java/android/accessibilityservice/AccessibilityGestureEvent.java index d4713cb611c30..4b2d741600062 100644 --- a/core/java/android/accessibilityservice/AccessibilityGestureEvent.java +++ b/core/java/android/accessibilityservice/AccessibilityGestureEvent.java @@ -204,7 +204,7 @@ public final class AccessibilityGestureEvent implements Parcelable { @Override public String toString() { StringBuilder stringBuilder = new StringBuilder("AccessibilityGestureEvent["); - stringBuilder.append("gestureId: ").append(eventTypeToString(mGestureId)); + stringBuilder.append("gestureId: ").append(gestureIdToString(mGestureId)); stringBuilder.append(", "); stringBuilder.append("displayId: ").append(mDisplayId); stringBuilder.append(", "); @@ -222,8 +222,12 @@ public final class AccessibilityGestureEvent implements Parcelable { return stringBuilder.toString(); } - private static String eventTypeToString(int eventType) { - switch (eventType) { + /** + * Returns a string representation of the specified gesture id. + */ + @NonNull + public static String gestureIdToString(int id) { + switch (id) { case GESTURE_UNKNOWN: return "GESTURE_UNKNOWN"; case GESTURE_PASSTHROUGH: return "GESTURE_PASSTHROUGH"; case GESTURE_TOUCH_EXPLORATION: return "GESTURE_TOUCH_EXPLORATION"; @@ -278,7 +282,7 @@ public final class AccessibilityGestureEvent implements Parcelable { case GESTURE_4_FINGER_SWIPE_LEFT: return "GESTURE_4_FINGER_SWIPE_LEFT"; case GESTURE_4_FINGER_SWIPE_RIGHT: return "GESTURE_4_FINGER_SWIPE_RIGHT"; case GESTURE_4_FINGER_SWIPE_UP: return "GESTURE_4_FINGER_SWIPE_UP"; - default: return Integer.toHexString(eventType); + default: return Integer.toHexString(id); } }