drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add new API to set URI on AssistContent." into mnc-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2015-05-28 21:35:40 +00:00
committed by Android (Google) Code Review
parent bf7fe1e051 09d57fe9b3
commit 4573dddcce
12 changed files with 163 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionSession.java
View File

@ -119,11 +119,16 @@ public class MainInteractionSession extends VoiceInteractionSession
}
@Override
public void onHandleAssist(Bundle assistBundle) {
if (assistBundle != null) {
parseAssistData(assistBundle);
} else {
Log.i(TAG, "onHandleAssist: NO ASSIST BUNDLE");
public void onHandleAssist(Bundle data, AssistStructure structure, AssistContent content) {
mAssistStructure = structure;
if (mAssistStructure != null) {
if (mAssistVisualizer != null) {
mAssistVisualizer.setAssistStructure(mAssistStructure);
}
}
if (content != null) {
Log.i(TAG, "Assist intent: " + content.getIntent());
Log.i(TAG, "Assist clipdata: " + content.getClipData());
}
}
@ -139,29 +144,6 @@ public class MainInteractionSession extends VoiceInteractionSession
}
}
void parseAssistData(Bundle assistBundle) {
if (assistBundle != null) {
Bundle assistContext = assistBundle.getBundle(Intent.EXTRA_ASSIST_CONTEXT);
if (assistContext != null) {
mAssistStructure = AssistStructure.getAssistStructure(assistContext);
if (mAssistStructure != null) {
if (mAssistVisualizer != null) {
mAssistVisualizer.setAssistStructure(mAssistStructure);
}
}
AssistContent content = AssistContent.getAssistContent(assistContext);
if (content != null) {
Log.i(TAG, "Assist intent: " + content.getIntent());
Log.i(TAG, "Assist clipdata: " + content.getClipData());
}
return;
}
}
if (mAssistVisualizer != null) {
mAssistVisualizer.clearAssistData();
}
}
void updateState() {
if (mState == STATE_IDLE) {
mTopContent.setVisibility(View.VISIBLE);