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

Commit 1981dd3b authored by Andreas Agvard's avatar Andreas Agvard Committed by Android (Google) Code Review
Browse files

Merge "Adds a new assistant invocation type for long press nav handle" into udc-qpr-dev

parents f4c17a17 40895a01

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

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

    /** value for INVOCATION_TYPE_KEY: press on physcial assistant button */

    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;



    private final Context mContext;

    private final IVoiceInteractionManagerService mVoiceInteractionManagerService;

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

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

    public static final int INVOCATION_TYPE_POWER_BUTTON_LONG_PRESS =

            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 DISMISS_REASON_INVOCATION_CANCELLED = 1;

    public static final int DISMISS_REASON_TAP = 2;