Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23c1fffc authored by Xinglong (Alan) Luan's avatar Xinglong (Alan) Luan Committed by Android (Google) Code Review
Browse files

Merge "Add a new assistant invocation type for status bar icon" into main

parents e97bb85a 47f90cbf

core/java/com/android/internal/app/AssistUtils.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -63,6 +63,8 @@ public class AssistUtils { 
    public static final int INVOCATION_TYPE_NAV_HANDLE_LONG_PRESS = 8;

    public static final int INVOCATION_TYPE_NAV_HANDLE_LONG_PRESS = 8;

    /** value for INVOCATION_TYPE_KEY: sysui launcher */

    /** value for INVOCATION_TYPE_KEY: sysui launcher */

    public static final int INVOCATION_TYPE_LAUNCHER_SYSTEM_SHORTCUT = 9;

    public static final int INVOCATION_TYPE_LAUNCHER_SYSTEM_SHORTCUT = 9;

    /** value for INVOCATION_TYPE_KEY: status bar icon */

    public static final int INVOCATION_TYPE_STATUS_BAR_ICON = 10;





    private final Context mContext;

    private final Context mContext;

    private final IVoiceInteractionManagerService mVoiceInteractionManagerService;

    private final IVoiceInteractionManagerService mVoiceInteractionManagerService;

packages/SystemUI/src/com/android/systemui/assist/AssistManager.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -136,6 +136,8 @@ public class AssistManager { 
            AssistUtils.INVOCATION_TYPE_NAV_HANDLE_LONG_PRESS;

            AssistUtils.INVOCATION_TYPE_NAV_HANDLE_LONG_PRESS;

    public static final int INVOCATION_TYPE_LAUNCHER_SYSTEM_SHORTCUT =

    public static final int INVOCATION_TYPE_LAUNCHER_SYSTEM_SHORTCUT =

            AssistUtils.INVOCATION_TYPE_LAUNCHER_SYSTEM_SHORTCUT;

            AssistUtils.INVOCATION_TYPE_LAUNCHER_SYSTEM_SHORTCUT;

    public static final int INVOCATION_TYPE_STATUS_BAR_ICON =

            AssistUtils.INVOCATION_TYPE_STATUS_BAR_ICON;





    public static final int DISMISS_REASON_INVOCATION_CANCELLED = 1;

    public static final int DISMISS_REASON_INVOCATION_CANCELLED = 1;

    public static final int DISMISS_REASON_TAP = 2;

    public static final int DISMISS_REASON_TAP = 2;