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

Commit 64e71cd6 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'assist' 

* changes:
  Add test assist to implement motion study
  Implement new assist gesture and motion
  Add flag to voice interactor for supporting assist gesture
  Add more internal API's for assist
  Add ability to start voice interaction session directly
parents edea751f 6e9fa1a4

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -267,6 +267,7 @@ LOCAL_SRC_FILES += \ 
	core/java/com/android/internal/app/IBatteryStats.aidl \

	core/java/com/android/internal/app/IProcessStats.aidl \

	core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl \

	core/java/com/android/internal/app/IVoiceInteractionSessionShowCallback.aidl \

	core/java/com/android/internal/app/IVoiceInteractor.aidl \

	core/java/com/android/internal/app/IVoiceInteractorCallback.aidl \

	core/java/com/android/internal/app/IVoiceInteractorRequest.aidl \

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -1200,6 +1200,7 @@ package android { 
    field public static final int summaryColumn = 16843426; // 0x10102a2

    field public static final int summaryOff = 16843248; // 0x10101f0

    field public static final int summaryOn = 16843247; // 0x10101ef

    field public static final int supportsAssistGesture = 16844012; // 0x10104ec

    field public static final int supportsRtl = 16843695; // 0x10103af

    field public static final int supportsSwitchingToNextInputMethod = 16843755; // 0x10103eb

    field public static final int supportsUploading = 16843419; // 0x101029b
@@ -28196,6 +28197,7 @@ package android.service.voice { 
    method public void showSession(android.os.Bundle, int);

    field public static final java.lang.String SERVICE_INTERFACE = "android.service.voice.VoiceInteractionService";

    field public static final java.lang.String SERVICE_META_DATA = "android.voice_interaction";

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

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

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

  }

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -1277,6 +1277,7 @@ package android { 
    field public static final int summaryColumn = 16843426; // 0x10102a2

    field public static final int summaryOff = 16843248; // 0x10101f0

    field public static final int summaryOn = 16843247; // 0x10101ef

    field public static final int supportsAssistGesture = 16844012; // 0x10104ec

    field public static final int supportsRtl = 16843695; // 0x10103af

    field public static final int supportsSwitchingToNextInputMethod = 16843755; // 0x10103eb

    field public static final int supportsUploading = 16843419; // 0x101029b
@@ -30271,6 +30272,7 @@ package android.service.voice { 
    method public void showSession(android.os.Bundle, int);

    field public static final java.lang.String SERVICE_INTERFACE = "android.service.voice.VoiceInteractionService";

    field public static final java.lang.String SERVICE_META_DATA = "android.voice_interaction";

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

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

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

  }

core/java/android/service/voice/IVoiceInteractionSession.aidl

+3 −1
Original line number Diff line number Diff line
@@ -20,11 +20,13 @@ import android.content.Intent; 
import android.graphics.Bitmap;

import android.os.Bundle;



import com.android.internal.app.IVoiceInteractionSessionShowCallback;



/**

 * @hide

 */

oneway interface IVoiceInteractionSession {

    void show(in Bundle sessionArgs, int flags);

    void show(in Bundle sessionArgs, int flags, IVoiceInteractionSessionShowCallback showCallback);

    void hide();

    void handleAssist(in Bundle assistData);

    void handleScreenshot(in Bitmap screenshot);

core/java/android/service/voice/VoiceInteractionService.java

+6 −0
Original line number Diff line number Diff line
@@ -82,6 +82,12 @@ public class VoiceInteractionService extends Service { 
     */

    public static final int START_WITH_SCREENSHOT = 1<<1;



    /**

     * Flag for use with {@link #showSession}: indicate that the session has been started from the

     * system assist gesture.

     */

    public static final int START_SOURCE_ASSIST_GESTURE = 1<<2;



    IVoiceInteractionService mInterface = new IVoiceInteractionService.Stub() {

        @Override public void ready() {

            mHandler.sendEmptyMessage(MSG_READY);