From f72605cb11065992a022184cb3b69406526d1a9f Mon Sep 17 00:00:00 2001 From: Jonah Williams Date: Wed, 6 Mar 2019 18:58:32 -0800 Subject: [PATCH 1/3] Revert "add signal to pointer kinds (#8065)" This reverts commit 3fb627f2c06a8c41d1e236518237fe4ee0a0d8d0. --- lib/ui/pointer.dart | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/ui/pointer.dart b/lib/ui/pointer.dart index b9a32cb56c1b5..fd5f3a13e25aa 100644 --- a/lib/ui/pointer.dart +++ b/lib/ui/pointer.dart @@ -50,9 +50,6 @@ enum PointerDeviceKind { /// A pointer device with a stylus that has been inverted. invertedStylus, - /// A pointer device that uses a pointer signal. - signal, - /// An unknown pointer device. unknown } From bf616a0488692c48943d751c7952036740fad89d Mon Sep 17 00:00:00 2001 From: jonahwilliams Date: Wed, 6 Mar 2019 19:08:06 -0800 Subject: [PATCH 2/3] remove kSignal from pointer_data.ht --- lib/ui/window/pointer_data.h | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/ui/window/pointer_data.h b/lib/ui/window/pointer_data.h index 56fd6067a1b35..f58c377044d3d 100644 --- a/lib/ui/window/pointer_data.h +++ b/lib/ui/window/pointer_data.h @@ -28,7 +28,6 @@ struct alignas(8) PointerData { kMouse, kStylus, kInvertedStylus, - kSignal, }; // Must match the PointerSignalKind enum in pointer.dart. From 061949106a897e473e2d64dac841791e03ab326a Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Wed, 6 Mar 2019 19:48:21 -0800 Subject: [PATCH 3/3] Remove PointerDeviceKindSignal from FlutterView.java --- shell/platform/android/io/flutter/view/FlutterView.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/shell/platform/android/io/flutter/view/FlutterView.java b/shell/platform/android/io/flutter/view/FlutterView.java index 6c42dc152d739..8df25207422ba 100644 --- a/shell/platform/android/io/flutter/view/FlutterView.java +++ b/shell/platform/android/io/flutter/view/FlutterView.java @@ -378,8 +378,7 @@ public InputConnection onCreateInputConnection(EditorInfo outAttrs) { private static final int kPointerDeviceKindMouse = 1; private static final int kPointerDeviceKindStylus = 2; private static final int kPointerDeviceKindInvertedStylus = 3; - private static final int kPointerDeviceKindSignal = 4; - private static final int kPointerDeviceKindUnknown = 5; + private static final int kPointerDeviceKindUnknown = 4; // Must match the PointerSignalKind enum in pointer.dart. private static final int kPointerSignalKindNone = 0;