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

Commit b5ec0b80 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add SHOW_SOURCE_PUSH_TO_TALK to indicate that the interaction service... 

Merge "Add SHOW_SOURCE_PUSH_TO_TALK to indicate that the interaction service was invoked by a hardware button."
parents 53208af2 78b8917e

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -39666,6 +39666,7 @@ package android.service.voice { 
    field public static final int SHOW_SOURCE_ACTIVITY = 16; // 0x10

    field public static final int SHOW_SOURCE_APPLICATION = 8; // 0x8

    field public static final int SHOW_SOURCE_ASSIST_GESTURE = 4; // 0x4

    field public static final int SHOW_SOURCE_PUSH_TO_TALK = 32; // 0x20

    field public static final int SHOW_WITH_ASSIST = 1; // 0x1

    field public static final int SHOW_WITH_SCREENSHOT = 2; // 0x2

  }

core/java/android/service/voice/VoiceInteractionSession.java

+6 −0
Original line number Diff line number Diff line
@@ -109,6 +109,12 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall 
     */

    public static final int SHOW_SOURCE_ACTIVITY = 1<<4;



    /**

     * Flag for use with {@link #onShow}: indicates that the voice interaction service was invoked

     * from a physical button.

     */

    public static final int SHOW_SOURCE_PUSH_TO_TALK = 1 << 5;



    final Context mContext;

    final HandlerCaller mHandlerCaller;