summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nick Beato <nbeato@google.com> 2025-03-14 20:58:34 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2025-03-14 20:58:34 -0700
commit6da88a8f5561e8c78ee57c5e2769a91ff4bf8b66 (patch)
tree7bf8749cb554d808d48d5cea48cdfd716b997497
parentc9ed451b4c42cdbc4505f3f81a706ae7b8cb8c03 (diff)
parent0d919d0fbb3d72de3e1f87999ec61a39ba374a42 (diff)
Merge "Add INVOCATION_TYPE_LAUNCHER_SYSTEM_SHORTCUT for VIS calls from SysUI launcher." into main
-rw-r--r--core/java/com/android/internal/app/AssistUtils.java2
-rw-r--r--packages/SystemUI/src/com/android/systemui/assist/AssistManager.java2
2 files changed, 4 insertions, 0 deletions
diff --git a/core/java/com/android/internal/app/AssistUtils.java b/core/java/com/android/internal/app/AssistUtils.java
index 4261a0f14767..dd9cf9d7718e 100644
--- a/core/java/com/android/internal/app/AssistUtils.java
+++ b/core/java/com/android/internal/app/AssistUtils.java
@@ -61,6 +61,8 @@ public class AssistUtils {
public static final int INVOCATION_TYPE_ASSIST_BUTTON = 7;
/** value for INVOCATION_TYPE_KEY: long press on nav handle */
public static final int INVOCATION_TYPE_NAV_HANDLE_LONG_PRESS = 8;
+ /** value for INVOCATION_TYPE_KEY: sysui launcher */
+ public static final int INVOCATION_TYPE_LAUNCHER_SYSTEM_SHORTCUT = 9;
private final Context mContext;
private final IVoiceInteractionManagerService mVoiceInteractionManagerService;
diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
index da1c1bc49d23..2d44d401b0b0 100644
--- a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
+++ b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
@@ -130,6 +130,8 @@ public class AssistManager {
AssistUtils.INVOCATION_TYPE_POWER_BUTTON_LONG_PRESS;
public static final int INVOCATION_TYPE_NAV_HANDLE_LONG_PRESS =
AssistUtils.INVOCATION_TYPE_NAV_HANDLE_LONG_PRESS;
+ public static final int INVOCATION_TYPE_LAUNCHER_SYSTEM_SHORTCUT =
+ AssistUtils.INVOCATION_TYPE_LAUNCHER_SYSTEM_SHORTCUT;
public static final int DISMISS_REASON_INVOCATION_CANCELLED = 1;
public static final int DISMISS_REASON_TAP = 2;