Merge "Initial implementation of new voice interaction API." (522ff52f) · Commits · e / os / android_frameworks_base

Android.mk

+6 −0

Original line number	Diff line number	Diff line
		@@ -197,6 +197,8 @@ LOCAL_SRC_FILES += \
		core/java/android/service/dreams/IDreamService.aidl \
		core/java/android/service/trust/ITrustAgentService.aidl \
		core/java/android/service/trust/ITrustAgentServiceCallback.aidl \
		core/java/android/service/voice/IVoiceInteractionService.aidl \
		core/java/android/service/voice/IVoiceInteractionSession.aidl \
		core/java/android/service/wallpaper/IWallpaperConnection.aidl \
		core/java/android/service/wallpaper/IWallpaperEngine.aidl \
		core/java/android/service/wallpaper/IWallpaperService.aidl \
		@@ -230,6 +232,10 @@ 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/IUsageStats.aidl \
		core/java/com/android/internal/app/IVoiceInteractionManagerService.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 \
		core/java/com/android/internal/app/IMediaContainerService.aidl \
		core/java/com/android/internal/appwidget/IAppWidgetService.aidl \
		core/java/com/android/internal/appwidget/IAppWidgetHost.aidl \

api/current.txt

+51 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ package android {
		field public static final java.lang.String BIND_TEXT_SERVICE = "android.permission.BIND_TEXT_SERVICE";
		field public static final java.lang.String BIND_TRUST_AGENT_SERVICE = "android.permission.BIND_TRUST_AGENT_SERVICE";
		field public static final java.lang.String BIND_TV_INPUT = "android.permission.BIND_TV_INPUT";
		field public static final java.lang.String BIND_VOICE_INTERACTION = "android.permission.BIND_VOICE_INTERACTION";
		field public static final java.lang.String BIND_VPN_SERVICE = "android.permission.BIND_VPN_SERVICE";
		field public static final java.lang.String BIND_WALLPAPER = "android.permission.BIND_WALLPAPER";
		field public static final java.lang.String BLUETOOTH = "android.permission.BLUETOOTH";
		@@ -3202,6 +3203,7 @@ package android.app {
		method public int getTaskId();
		method public final java.lang.CharSequence getTitle();
		method public final int getTitleColor();
		method public android.app.VoiceInteractor getVoiceInteractor();
		method public final int getVolumeControlStream();
		method public android.view.Window getWindow();
		method public android.view.WindowManager getWindowManager();
		@@ -3213,6 +3215,7 @@ package android.app {
		method public boolean isFinishing();
		method public boolean isImmersive();
		method public boolean isTaskRoot();
		method public boolean isVoiceInteraction();
		method public final deprecated android.database.Cursor managedQuery(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String);
		method public boolean moveTaskToBack(boolean);
		method public boolean navigateUpTo(android.content.Intent);
		@@ -4838,6 +4841,23 @@ package android.app {
		field public static final int MODE_NIGHT_YES = 2; // 0x2
		}

		public class VoiceInteractor {
		method public android.app.VoiceInteractor.Request startCommand(android.app.VoiceInteractor.Callback, java.lang.String, android.os.Bundle);
		method public android.app.VoiceInteractor.Request startConfirmation(android.app.VoiceInteractor.Callback, java.lang.String, android.os.Bundle);
		method public boolean[] supportsCommands(java.lang.String[]);
		}

		public static class VoiceInteractor.Callback {
		ctor public VoiceInteractor.Callback();
		method public void onCancel(android.app.VoiceInteractor.Request);
		method public void onCommandResult(android.app.VoiceInteractor.Request, android.os.Bundle);
		method public void onConfirmationResult(android.app.VoiceInteractor.Request, boolean, android.os.Bundle);
		}

		public static class VoiceInteractor.Request {
		method public void cancel();
		}

		public final class WallpaperInfo implements android.os.Parcelable {
		ctor public WallpaperInfo(android.content.Context, android.content.pm.ResolveInfo) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
		method public int describeContents();
		@@ -6997,6 +7017,7 @@ package android.content {
		field public static final java.lang.String CATEGORY_TAB = "android.intent.category.TAB";
		field public static final java.lang.String CATEGORY_TEST = "android.intent.category.TEST";
		field public static final java.lang.String CATEGORY_UNIT_TEST = "android.intent.category.UNIT_TEST";
		field public static final java.lang.String CATEGORY_VOICE = "android.intent.category.VOICE";
		field public static final android.os.Parcelable.Creator CREATOR;
		field public static final java.lang.String EXTRA_ALARM_COUNT = "android.intent.extra.ALARM_COUNT";
		field public static final java.lang.String EXTRA_ALLOW_MULTIPLE = "android.intent.extra.ALLOW_MULTIPLE";
		@@ -24883,6 +24904,36 @@ package android.service.trust {

		}

		package android.service.voice {

		public class VoiceInteractionService extends android.app.Service {
		ctor public VoiceInteractionService();
		method public android.os.IBinder onBind(android.content.Intent);
		method public void startVoiceActivity(android.content.Intent, android.service.voice.VoiceInteractionSession);
		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";
		}

		public abstract class VoiceInteractionSession {
		ctor public VoiceInteractionSession(android.content.Context);
		ctor public VoiceInteractionSession(android.content.Context, android.os.Handler);
		method public abstract void onCancel(android.service.voice.VoiceInteractionSession.Request);
		method public abstract void onCommand(android.service.voice.VoiceInteractionSession.Caller, android.service.voice.VoiceInteractionSession.Request, java.lang.String, android.os.Bundle);
		method public abstract void onConfirm(android.service.voice.VoiceInteractionSession.Caller, android.service.voice.VoiceInteractionSession.Request, java.lang.String, android.os.Bundle);
		method public abstract boolean[] onGetSupportedCommands(android.service.voice.VoiceInteractionSession.Caller, java.lang.String[]);
		}

		public static class VoiceInteractionSession.Caller {
		}

		public static class VoiceInteractionSession.Request {
		method public void sendCancelResult();
		method public void sendCommandResult(android.os.Bundle);
		method public void sendConfirmResult(boolean, android.os.Bundle);
		}

		}

		package android.service.wallpaper {

		public abstract class WallpaperService extends android.app.Service {

cmds/am/src/com/android/commands/am/Am.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -749,6 +749,11 @@ public class Am extends BaseCommand {
		"Error: Activity not started, you do not "
		+ "have permission to access it.");
		break;
		case ActivityManager.START_NOT_VOICE_COMPATIBLE:
		out.println(
		"Error: Activity not started, voice control not allowed for: "
		+ intent);
		break;
		default:
		out.println(
		"Error: Activity not started, unknown error code " + res);

core/java/android/app/Activity.java

+24 −2

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.transition.TransitionManager;
		import android.util.ArrayMap;
		import android.util.SuperNotCalledException;
		import android.widget.Toolbar;
		import com.android.internal.app.IVoiceInteractor;
		import com.android.internal.app.WindowDecorActionBar;
		import com.android.internal.app.ToolbarActionBar;
		import com.android.internal.policy.PolicyManager;
		@@ -726,6 +727,8 @@ public class Activity extends ContextThemeWrapper
		/package/ ActionBar mActionBar = null;
		private boolean mEnableDefaultActionBarUp;

		private VoiceInteractor mVoiceInteractor;

		private CharSequence mTitle;
		private int mTitleColor = 0;

		@@ -1133,6 +1136,23 @@ public class Activity extends ContextThemeWrapper
		mCalled = true;
		}

		/**
		* Check whether this activity is running as part of a voice interaction with the user.
		* If true, it should perform its interaction with the user through the
		* {@link VoiceInteractor} returned by {@link #getVoiceInteractor}.
		*/
		public boolean isVoiceInteraction() {
		return mVoiceInteractor != null;
		}

		/**
		* Retrieve the active {@link VoiceInteractor} that the user is going through to
		* interact with this activity.
		*/
		public VoiceInteractor getVoiceInteractor() {
		return mVoiceInteractor;
		}

		/**
		* This is called for activities that set launchMode to "singleTop" in
		* their package, or if a client used the {@link Intent#FLAG_ACTIVITY_SINGLE_TOP}
		@@ -5397,7 +5417,7 @@ public class Activity extends ContextThemeWrapper
		NonConfigurationInstances lastNonConfigurationInstances,
		Configuration config) {
		attach(context, aThread, instr, token, ident, application, intent, info, title, parent, id,
		lastNonConfigurationInstances, config, null);
		lastNonConfigurationInstances, config, null, null);
		}

		final void attach(Context context, ActivityThread aThread,
		@@ -5405,7 +5425,7 @@ public class Activity extends ContextThemeWrapper
		Application application, Intent intent, ActivityInfo info,
		CharSequence title, Activity parent, String id,
		NonConfigurationInstances lastNonConfigurationInstances,
		Configuration config, Bundle options) {
		Configuration config, Bundle options, IVoiceInteractor voiceInteractor) {
		attachBaseContext(context);

		mFragments.attachActivity(this, mContainer, null);
		@@ -5433,6 +5453,8 @@ public class Activity extends ContextThemeWrapper
		mParent = parent;
		mEmbeddedID = id;
		mLastNonConfigurationInstances = lastNonConfigurationInstances;
		mVoiceInteractor = voiceInteractor != null
		? new VoiceInteractor(this, voiceInteractor, Looper.myLooper()) : null;

		mWindow.setWindowManager(
		(WindowManager)context.getSystemService(Context.WINDOW_SERVICE),

core/java/android/app/ActivityManager.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -75,6 +75,13 @@ public class ActivityManager {
		*/
		public static final String META_HOME_ALTERNATE = "android.app.home.alternate";

		/**
		* Result for IActivityManager.startActivity: trying to start an activity under voice
		* control when that activity does not support the VOICE category.
		* @hide
		*/
		public static final int START_NOT_VOICE_COMPATIBLE = -7;

		/**
		* Result for IActivityManager.startActivity: an error where the
		* start had to be canceled.