diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-05-16 23:31:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-16 23:32:00 +0000 |
| commit | f2eba13932d0bdd90fefa6cd9a94e59c209a0866 (patch) | |
| tree | 681037daf4752c0cc2813f0ea16fbe38a370666b /core | |
| parent | b8f5cae141e5d63547f492db7fc4caf107a8394f (diff) | |
| parent | dcff99598f16737e75278e8ea9dbfe92579ea234 (diff) | |
| download | frameworks_base-f2eba13932d0bdd90fefa6cd9a94e59c209a0866.zip frameworks_base-f2eba13932d0bdd90fefa6cd9a94e59c209a0866.tar.gz frameworks_base-f2eba13932d0bdd90fefa6cd9a94e59c209a0866.tar.bz2 | |
Merge "Hide voice interaction APIs."
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/Activity.java | 2 | ||||
| -rw-r--r-- | core/java/android/app/VoiceInteractor.java | 1 | ||||
| -rw-r--r-- | core/java/android/content/Intent.java | 1 | ||||
| -rw-r--r-- | core/java/android/service/voice/package.html | 5 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/attrs.xml | 3 |
6 files changed, 12 insertions, 2 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 36c36a8..87789de 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -1222,6 +1222,7 @@ public class Activity extends ContextThemeWrapper * 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}. + * @hide */ public boolean isVoiceInteraction() { return mVoiceInteractor != null; @@ -1230,6 +1231,7 @@ public class Activity extends ContextThemeWrapper /** * Retrieve the active {@link VoiceInteractor} that the user is going through to * interact with this activity. + * @hide */ public VoiceInteractor getVoiceInteractor() { return mVoiceInteractor; diff --git a/core/java/android/app/VoiceInteractor.java b/core/java/android/app/VoiceInteractor.java index 6dc48b0..4fcf7cd 100644 --- a/core/java/android/app/VoiceInteractor.java +++ b/core/java/android/app/VoiceInteractor.java @@ -34,6 +34,7 @@ import java.util.WeakHashMap; /** * Interface for an {@link Activity} to interact with the user through voice. + * @hide */ public class VoiceInteractor { static final String TAG = "VoiceInteractor"; diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 076f657..fed63d2 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -2809,6 +2809,7 @@ public class Intent implements Parcelable, Cloneable { * An activity that supports this category must be prepared to run with * no UI shown at all (though in some case it may have a UI shown), and * rely on {@link android.app.VoiceInteractor} to interact with the user. + * @hide */ @SdkConstant(SdkConstantType.INTENT_CATEGORY) public static final String CATEGORY_VOICE = "android.intent.category.VOICE"; diff --git a/core/java/android/service/voice/package.html b/core/java/android/service/voice/package.html new file mode 100644 index 0000000..1c9bf9d --- /dev/null +++ b/core/java/android/service/voice/package.html @@ -0,0 +1,5 @@ +<html> +<body> + {@hide} +</body> +</html> diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 4eac802..f262a93 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2056,7 +2056,7 @@ android:protectionLevel="signature|system" /> <!-- Must be required by a {@link android.service.voice.VoiceInteractionService}, - to ensure that only the system can bind to it. --> + to ensure that only the system can bind to it. @hide --> <permission android:name="android.permission.BIND_VOICE_INTERACTION" android:label="@string/permlab_bindVoiceInteraction" android:description="@string/permdesc_bindVoiceInteraction" diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 29a0e3d..3746780 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -6344,8 +6344,9 @@ <!-- Use <code>voice-interaction-service</code> as the root tag of the XML resource that describes a {@link android.service.voice.VoiceInteractionService}, which is referenced from its {@link android.service.voice.VoiceInteractionService#SERVICE_META_DATA} meta-data entry. - Described here are the attributes that can be included in that tag. --> + Described here are the attributes that can be included in that tag. @hide --> <declare-styleable name="VoiceInteractionService"> + <!-- @hide --> <attr name="sessionService" format="string" /> <attr name="settingsActivity" /> </declare-styleable> |