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

Commit 4de0ce30 authored by Adnan Begovic's avatar Adnan Begovic Committed by Android (Google) Code Review
Browse files

Merge "fwb: Introduce constant for assist hw button." into udc-dev

parents 3d10089d a55decab

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

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

    /** value for INVOCATION_TYPE_KEY: long press on physical power button */

    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;



    private final Context mContext;

    private final IVoiceInteractionManagerService mVoiceInteractionManagerService;

services/core/java/com/android/server/policy/PhoneWindowManager.java

+1 −1
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    final int deviceId = msg.arg1;

                    final Long eventTime = (Long) msg.obj;

                    launchAssistAction(null /* hint */, deviceId, eventTime,

                            AssistUtils.INVOCATION_TYPE_UNKNOWN);

                            AssistUtils.INVOCATION_TYPE_ASSIST_BUTTON);

                    break;

                case MSG_LAUNCH_VOICE_ASSIST_WITH_WAKE_LOCK:

                    launchVoiceAssistWithWakeLock();