summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2015-07-21 22:46:30 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-21 22:46:30 +0000
commit20df62345910ad390a3bb321990987757db0831d (patch)
tree470e3f174ddda990ea375fb43271e32a0f4f5854 /tests
parentc1244a2995087c930842b7d5e5a35a446c5c40f7 (diff)
parent19695d97118d74aa7f54ba09b178e65378825cc0 (diff)
downloadframeworks_base-20df62345910ad390a3bb321990987757db0831d.zip
frameworks_base-20df62345910ad390a3bb321990987757db0831d.tar.gz
frameworks_base-20df62345910ad390a3bb321990987757db0831d.tar.bz2
Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev
Diffstat (limited to 'tests')
-rw-r--r--tests/Assist/src/com/android/test/assist/AssistInteractionSession.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/Assist/src/com/android/test/assist/AssistInteractionSession.java b/tests/Assist/src/com/android/test/assist/AssistInteractionSession.java
index 43f1e32..851bda9 100644
--- a/tests/Assist/src/com/android/test/assist/AssistInteractionSession.java
+++ b/tests/Assist/src/com/android/test/assist/AssistInteractionSession.java
@@ -24,6 +24,7 @@ import android.graphics.Color;
import android.os.Bundle;
import android.os.Handler;
import android.service.voice.VoiceInteractionSession;
+import android.util.Log;
import android.view.View;
import android.view.ViewAnimationUtils;
import android.view.ViewTreeObserver;
@@ -69,6 +70,7 @@ public class AssistInteractionSession extends VoiceInteractionSession {
@Override
public void onCreate() {
+ super.onCreate();
// Simulate slowness of Assist app
try {
Thread.sleep(1000);
@@ -105,6 +107,12 @@ public class AssistInteractionSession extends VoiceInteractionSession {
}
}
+ @Override
+ public void onLockscreenShown() {
+ super.onLockscreenShown();
+ Log.i("Assistant", "Lockscreen was shown");
+ }
+
private void playAssistAnimation() {
Interpolator linearOutSlowIn = AnimationUtils.loadInterpolator(mBackground.getContext(),
android.R.interpolator.linear_out_slow_in);