diff options
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/view/MotionEvent.java | 16 | ||||
| -rw-r--r-- | native/android/input.cpp | 2 |
3 files changed, 17 insertions, 2 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 4d25ad7d8b37..482d4894a520 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -49222,6 +49222,7 @@ package android.view { field public static final int CLASSIFICATION_AMBIGUOUS_GESTURE = 1; // 0x1 field public static final int CLASSIFICATION_DEEP_PRESS = 2; // 0x2 field public static final int CLASSIFICATION_NONE = 0; // 0x0 + field public static final int CLASSIFICATION_TWO_FINGER_SWIPE = 3; // 0x3 field @NonNull public static final android.os.Parcelable.Creator<android.view.MotionEvent> CREATOR; field public static final int EDGE_BOTTOM = 2; // 0x2 field public static final int EDGE_LEFT = 4; // 0x4 diff --git a/core/java/android/view/MotionEvent.java b/core/java/android/view/MotionEvent.java index ea0012543ba9..5ec796245774 100644 --- a/core/java/android/view/MotionEvent.java +++ b/core/java/android/view/MotionEvent.java @@ -1457,10 +1457,20 @@ public final class MotionEvent extends InputEvent implements Parcelable { */ public static final int CLASSIFICATION_DEEP_PRESS = 2; + /** + * Classification constant: touchpad scroll. + * + * The current event stream represents the user scrolling with two fingers on a touchpad. + * + * @see #getClassification + */ + public static final int CLASSIFICATION_TWO_FINGER_SWIPE = 3; + /** @hide */ @Retention(SOURCE) @IntDef(prefix = { "CLASSIFICATION" }, value = { - CLASSIFICATION_NONE, CLASSIFICATION_AMBIGUOUS_GESTURE, CLASSIFICATION_DEEP_PRESS}) + CLASSIFICATION_NONE, CLASSIFICATION_AMBIGUOUS_GESTURE, CLASSIFICATION_DEEP_PRESS, + CLASSIFICATION_TWO_FINGER_SWIPE}) public @interface Classification {}; /** @@ -3862,9 +3872,11 @@ public final class MotionEvent extends InputEvent implements Parcelable { return "AMBIGUOUS_GESTURE"; case CLASSIFICATION_DEEP_PRESS: return "DEEP_PRESS"; + case CLASSIFICATION_TWO_FINGER_SWIPE: + return "TWO_FINGER_SWIPE"; } - return "NONE"; + return "UNKNOWN"; } /** diff --git a/native/android/input.cpp b/native/android/input.cpp index a231d8f153e7..812db0f1c507 100644 --- a/native/android/input.cpp +++ b/native/android/input.cpp @@ -295,6 +295,8 @@ int32_t AMotionEvent_getClassification(const AInputEvent* motion_event) { return AMOTION_EVENT_CLASSIFICATION_AMBIGUOUS_GESTURE; case android::MotionClassification::DEEP_PRESS: return AMOTION_EVENT_CLASSIFICATION_DEEP_PRESS; + case android::MotionClassification::TWO_FINGER_SWIPE: + return AMOTION_EVENT_CLASSIFICATION_TWO_FINGER_SWIPE; } } |