summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorMatt Casey <mrcasey@google.com>2021-03-30 14:23:10 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-03-30 14:23:10 +0000
commit4dddebe4b8cd83541009a926fee7fd93879e75da (patch)
tree2917e72e3fd74ae379f9bf7dc2493264253fea13 /core/java/android
parent85826befaefa261d59b31683cad3415a30515a66 (diff)
parent38ced457e07dd49039fb7f7a588cd076bb047239 (diff)
Merge "Revert "Revert "Add setting for touch gesture and long-press hom..."" into sc-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/provider/Settings.java16
1 files changed, 16 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 16a8fa8d6c49..22d74ca33a83 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -9176,6 +9176,22 @@ public final class Settings {
public static final String ASSIST_GESTURE_SETUP_COMPLETE = "assist_gesture_setup_complete";
/**
+ * Whether the assistant can be triggered by a touch gesture.
+ *
+ * @hide
+ */
+ public static final String ASSIST_TOUCH_GESTURE_ENABLED =
+ "assist_touch_gesture_enabled";
+
+ /**
+ * Whether the assistant can be triggered by long-pressing the home button
+ *
+ * @hide
+ */
+ public static final String ASSIST_LONG_PRESS_HOME_ENABLED =
+ "assist_long_press_home_enabled";
+
+ /**
* Control whether Trust Agents are in active unlock or extend unlock mode.
* @hide
*/