Merge "Improve output of voice interaction test app." (5f50a4b8) · Commits · e / os / android_frameworks_base

tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionSession.java

+24 −10

Original line number	Diff line number	Diff line
		@@ -57,7 +57,9 @@ public class MainInteractionSession extends VoiceInteractionSession
		Button mCompleteButton;
		Button mAbortButton;

		Bundle mAssistData;
		AssistStructure mAssistStructure;
		AssistContent mAssistContent;

		static final int STATE_IDLE = 0;
		static final int STATE_LAUNCHING = 1;
		@@ -169,19 +171,15 @@ public class MainInteractionSession extends VoiceInteractionSession
		public void onHandleAssist(Bundle assistBundle) {
		}

		@Override
		public void onHandleAssist(Bundle data, AssistStructure structure, AssistContent content) {
		mAssistStructure = structure;
		if (mAssistVisualizer != null) {
		if (mAssistStructure != null) {
		mAssistVisualizer.setAssistStructure(mAssistStructure);
		} else {
		mAssistVisualizer.clearAssistData();
		}
		}
		private void logAssistContentAndData(AssistContent content, Bundle data) {
		if (content != null) {
		Log.i(TAG, "Assist intent: " + content.getIntent());
		Log.i(TAG, "Assist intent from app: " + content.isAppProvidedIntent());
		Log.i(TAG, "Assist clipdata: " + content.getClipData());
		Log.i(TAG, "Assist structured data: " + content.getStructuredData());
		Log.i(TAG, "Assist web uri: " + content.getWebUri());
		Log.i(TAG, "Assist web uri from app: " + content.isAppProvidedWebUri());
		Log.i(TAG, "Assist extras: " + content.getExtras());
		}
		if (data != null) {
		Uri referrer = data.getParcelable(Intent.EXTRA_REFERRER);
		@@ -191,6 +189,21 @@ public class MainInteractionSession extends VoiceInteractionSession
		}
		}

		@Override
		public void onHandleAssist(Bundle data, AssistStructure structure, AssistContent content) {
		mAssistData = data;
		mAssistStructure = structure;
		mAssistContent = content;
		if (mAssistVisualizer != null) {
		if (mAssistStructure != null) {
		mAssistVisualizer.setAssistStructure(mAssistStructure);
		} else {
		mAssistVisualizer.clearAssistData();
		}
		}
		logAssistContentAndData(content, data);
		}

		@Override
		public void onHandleAssistSecondary(final Bundle data, final AssistStructure structure,
		final AssistContent content, int index, int count) {
		@@ -246,6 +259,7 @@ public class MainInteractionSession extends VoiceInteractionSession
		public void onClick(View v) {
		if (v == mTreeButton) {
		if (mAssistVisualizer != null) {
		logAssistContentAndData(mAssistContent, mAssistData);
		mAssistVisualizer.logTree();
		}
		} else if (v == mTextButton) {