diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-05-21 14:16:46 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2014-05-21 14:16:46 -0700 |
| commit | fb052926b84d69fdc4bebcb0373e33388c7bcbb7 (patch) | |
| tree | fc9779ad29c39da08947322a77ff18bad6dfafdd /core/res | |
| parent | f66bdfc2407297f0d9bef4b17670074a2cc08a2c (diff) | |
| download | frameworks_base-fb052926b84d69fdc4bebcb0373e33388c7bcbb7.zip frameworks_base-fb052926b84d69fdc4bebcb0373e33388c7bcbb7.tar.gz frameworks_base-fb052926b84d69fdc4bebcb0373e33388c7bcbb7.tar.bz2 | |
Revert "Hide voice interaction APIs."
This reverts commit a677a9b9367bcf8c81c36dc59b53554cb347b438.
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/attrs.xml | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 7b200c4..1874fd8 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2049,7 +2049,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. @hide --> + to ensure that only the system can bind to it. --> <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 4b03f31..fd81362 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -6339,9 +6339,8 @@ <!-- 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. @hide --> + Described here are the attributes that can be included in that tag. --> <declare-styleable name="VoiceInteractionService"> - <!-- @hide --> <attr name="sessionService" format="string" /> <attr name="settingsActivity" /> </declare-styleable> |