summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorAmeer Armaly <aarmaly@google.com>2020-01-08 15:01:39 -0800
committerAmeer Armaly <aarmaly@google.com>2020-01-24 15:41:52 -0800
commitbb9b8d4d5af8a4d8f5811cf785976cdbf61eb143 (patch)
tree8cdd1cc77007cd3c56fcb5fb4bb660d9a3bca388 /core/java/android
parentab60f20fdad20c26ff257b312fc66ef303d1924d (diff)
Add flag for services to request multi-finger gestures.
Bug: 136131815 Test: atest GestureManifoldTest AccessibilityGestureDetectorTest TouchExplorerTest Change-Id: Ia6eac44f467963856ca7b8ba561794fa5e49b953
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/accessibilityservice/AccessibilityServiceInfo.java12
-rw-r--r--core/java/android/view/accessibility/AccessibilityManager.java3
2 files changed, 15 insertions, 0 deletions
diff --git a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java
index 342b6a5ba7e0..82c7635fa5e3 100644
--- a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java
+++ b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java
@@ -351,6 +351,16 @@ public class AccessibilityServiceInfo implements Parcelable {
*/
public static final int FLAG_SERVICE_HANDLES_DOUBLE_TAP = 0x0000800;
+ /**
+ * This flag requests that when when {@link #FLAG_REQUEST_TOUCH_EXPLORATION_MODE} is enabled,
+ * multi-finger gestures are also enabled. As a consequence, two-finger bypass gestures will be
+ * disabled. If {@link #FLAG_REQUEST_TOUCH_EXPLORATION_MODE} is disabled this flag has no
+ * effect.
+ *
+ * @see #FLAG_REQUEST_TOUCH_EXPLORATION_MODE
+ */
+ public static final int FLAG_REQUEST_MULTI_FINGER_GESTURES = 0x0001000;
+
/** {@hide} */
public static final int FLAG_FORCE_DIRECT_BOOT_AWARE = 0x00010000;
@@ -1233,6 +1243,8 @@ public class AccessibilityServiceInfo implements Parcelable {
return "FLAG_REQUEST_TOUCH_EXPLORATION_MODE";
case FLAG_SERVICE_HANDLES_DOUBLE_TAP:
return "FLAG_SERVICE_HANDLES_DOUBLE_TAP";
+ case FLAG_REQUEST_MULTI_FINGER_GESTURES:
+ return "FLAG_REQUEST_MULTI_FINGER_GESTURES";
case FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITY:
return "FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITY";
case FLAG_REPORT_VIEW_IDS:
diff --git a/core/java/android/view/accessibility/AccessibilityManager.java b/core/java/android/view/accessibility/AccessibilityManager.java
index 4b49d67fe44d..02b098b27974 100644
--- a/core/java/android/view/accessibility/AccessibilityManager.java
+++ b/core/java/android/view/accessibility/AccessibilityManager.java
@@ -105,6 +105,9 @@ public final class AccessibilityManager {
public static final int STATE_FLAG_DISPATCH_DOUBLE_TAP = 0x00000008;
/** @hide */
+ public static final int STATE_FLAG_REQUEST_MULTI_FINGER_GESTURES = 0x00000010;
+
+ /** @hide */
public static final int DALTONIZER_DISABLED = -1;
/** @hide */