From 2ee5c368f844bc0f6ce55ff6d5cf3d5604cad5d8 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Fri, 29 May 2015 17:58:53 -0700 Subject: Update VoiceInteractionService from API review. This may even manage to retain compatibility with existing binaries! (For now.) Change-Id: I3b1386287a6b9b20b57ac2e2444fd6f458837277 --- .../Assist/src/com/android/test/assist/AssistInteractionSession.java | 5 +---- .../com/android/test/voiceinteraction/MainInteractionService.java | 3 ++- .../com/android/test/voiceinteraction/MainInteractionSession.java | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/Assist/src/com/android/test/assist/AssistInteractionSession.java b/tests/Assist/src/com/android/test/assist/AssistInteractionSession.java index 0b522c0..e4ea0bc 100644 --- a/tests/Assist/src/com/android/test/assist/AssistInteractionSession.java +++ b/tests/Assist/src/com/android/test/assist/AssistInteractionSession.java @@ -17,16 +17,13 @@ package com.android.test.assist; import android.animation.Animator; -import android.animation.RevealAnimator; import android.animation.ValueAnimator; import android.app.VoiceInteractor; import android.content.Context; import android.graphics.Color; import android.os.Bundle; import android.os.Handler; -import android.service.voice.VoiceInteractionService; import android.service.voice.VoiceInteractionSession; -import android.util.Log; import android.view.View; import android.view.ViewAnimationUtils; import android.view.ViewTreeObserver; @@ -105,7 +102,7 @@ public class AssistInteractionSession extends VoiceInteractionSession { @Override public void onShow(Bundle args, int showFlags) { super.onShow(args, showFlags); - if ((showFlags & VoiceInteractionService.START_SOURCE_ASSIST_GESTURE) != 0) { + if ((showFlags & SHOW_SOURCE_ASSIST_GESTURE) != 0) { mBackground.getViewTreeObserver().addOnPreDrawListener( new ViewTreeObserver.OnPreDrawListener() { @Override diff --git a/tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionService.java b/tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionService.java index 15196b4..578e356 100644 --- a/tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionService.java +++ b/tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionService.java @@ -23,6 +23,7 @@ import android.service.voice.AlwaysOnHotwordDetector; import android.service.voice.AlwaysOnHotwordDetector.Callback; import android.service.voice.AlwaysOnHotwordDetector.EventPayload; import android.service.voice.VoiceInteractionService; +import android.service.voice.VoiceInteractionSession; import android.util.Log; import java.util.Arrays; @@ -79,7 +80,7 @@ public class MainInteractionService extends VoiceInteractionService { Bundle args = new Bundle(); args.putParcelable("intent", new Intent(this, TestInteractionActivity.class)); args.putBundle("assist", intent.getExtras()); - startSession(args, START_WITH_ASSIST|START_WITH_SCREENSHOT); + startSession(args, VoiceInteractionSession.SHOW_WITH_ASSIST | VoiceInteractionSession.SHOW_WITH_SCREENSHOT); } else { Log.w(TAG, "Not starting -- not current voice interaction service"); } diff --git a/tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionSession.java b/tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionSession.java index 70a6336..f66a9ce 100644 --- a/tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionSession.java +++ b/tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionSession.java @@ -69,7 +69,7 @@ public class MainInteractionSession extends VoiceInteractionSession @Override public void onCreate(Bundle args, int startFlags) { - super.onCreate(args); + super.onCreate(args, startFlags); ActivityManager am = getContext().getSystemService(ActivityManager.class); am.setWatchHeapLimit(40*1024*1024); } -- cgit v1.1