Skip to content

Commit 52af3a4

Browse files
author
Mike LeBeau
committed
Unhide RecognizerResultsIntent. This API was
reviewed for Froyo, but we didn't want to make it public then because it wasn't until our first Market release of Voice Search that the APIs would be in use by our app. http://b/3135351 Change-Id: I49053717cac08e3976c22e3a105139b6755aadb8
1 parent c724f2f commit 52af3a4

File tree

2 files changed

+89
-17
lines changed

2 files changed

+89
-17
lines changed

api/current.xml

Lines changed: 87 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147094,6 +147094,92 @@
147094147094
>
147095147095
</field>
147096147096
</class>
147097+
<class name="RecognizerResultsIntent"
147098+
extends="java.lang.Object"
147099+
abstract="false"
147100+
static="false"
147101+
final="false"
147102+
deprecated="not deprecated"
147103+
visibility="public"
147104+
>
147105+
<field name="ACTION_VOICE_SEARCH_RESULTS"
147106+
type="java.lang.String"
147107+
transient="false"
147108+
volatile="false"
147109+
value="&quot;android.speech.action.VOICE_SEARCH_RESULTS&quot;"
147110+
static="true"
147111+
final="true"
147112+
deprecated="not deprecated"
147113+
visibility="public"
147114+
>
147115+
</field>
147116+
<field name="EXTRA_VOICE_SEARCH_RESULT_HTML"
147117+
type="java.lang.String"
147118+
transient="false"
147119+
volatile="false"
147120+
value="&quot;android.speech.extras.VOICE_SEARCH_RESULT_HTML&quot;"
147121+
static="true"
147122+
final="true"
147123+
deprecated="not deprecated"
147124+
visibility="public"
147125+
>
147126+
</field>
147127+
<field name="EXTRA_VOICE_SEARCH_RESULT_HTML_BASE_URLS"
147128+
type="java.lang.String"
147129+
transient="false"
147130+
volatile="false"
147131+
value="&quot;android.speech.extras.VOICE_SEARCH_RESULT_HTML_BASE_URLS&quot;"
147132+
static="true"
147133+
final="true"
147134+
deprecated="not deprecated"
147135+
visibility="public"
147136+
>
147137+
</field>
147138+
<field name="EXTRA_VOICE_SEARCH_RESULT_HTTP_HEADERS"
147139+
type="java.lang.String"
147140+
transient="false"
147141+
volatile="false"
147142+
value="&quot;android.speech.extras.EXTRA_VOICE_SEARCH_RESULT_HTTP_HEADERS&quot;"
147143+
static="true"
147144+
final="true"
147145+
deprecated="not deprecated"
147146+
visibility="public"
147147+
>
147148+
</field>
147149+
<field name="EXTRA_VOICE_SEARCH_RESULT_STRINGS"
147150+
type="java.lang.String"
147151+
transient="false"
147152+
volatile="false"
147153+
value="&quot;android.speech.extras.VOICE_SEARCH_RESULT_STRINGS&quot;"
147154+
static="true"
147155+
final="true"
147156+
deprecated="not deprecated"
147157+
visibility="public"
147158+
>
147159+
</field>
147160+
<field name="EXTRA_VOICE_SEARCH_RESULT_URLS"
147161+
type="java.lang.String"
147162+
transient="false"
147163+
volatile="false"
147164+
value="&quot;android.speech.extras.VOICE_SEARCH_RESULT_URLS&quot;"
147165+
static="true"
147166+
final="true"
147167+
deprecated="not deprecated"
147168+
visibility="public"
147169+
>
147170+
</field>
147171+
<field name="URI_SCHEME_INLINE"
147172+
type="java.lang.String"
147173+
transient="false"
147174+
volatile="false"
147175+
value="&quot;inline&quot;"
147176+
static="true"
147177+
final="true"
147178+
deprecated="not deprecated"
147179+
visibility="public"
147180+
>
147181+
</field>
147182+
</class>
147097147183
<class name="SpeechRecognizer"
147098147184
extends="java.lang.Object"
147099147185
abstract="false"
@@ -224617,7 +224703,7 @@
224617224703
deprecated="not deprecated"
224618224704
visibility="public"
224619224705
>
224620-
<parameter name="arg0" type="T">
224706+
<parameter name="t" type="T">
224621224707
</parameter>
224622224708
</method>
224623224709
</interface>

core/java/android/speech/RecognizerResultsIntent.java

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@
3434
* the search results. If that is not available, then the corresponding url for that result in
3535
* {@link #EXTRA_VOICE_SEARCH_RESULT_URLS} should be used. And if even that is not available,
3636
* then a search url should be constructed from the actual recognition result string.
37-
*
38-
* @hide for making public in a later release
3937
*/
4038
public class RecognizerResultsIntent {
4139
private RecognizerResultsIntent() {
@@ -58,17 +56,13 @@ private RecognizerResultsIntent() {
5856
* and, possibly, the full html to display for that result at index N of
5957
* {@link #EXTRA_VOICE_SEARCH_RESULT_HTML}. If full html is provided, a base url (or
6058
* list of base urls) should be provided with {@link #EXTRA_VOICE_SEARCH_RESULT_HTML_BASE_URLS}.
61-
*
62-
* @hide for making public in a later release
6359
*/
6460
public static final String ACTION_VOICE_SEARCH_RESULTS =
6561
"android.speech.action.VOICE_SEARCH_RESULTS";
6662

6763
/**
6864
* The key to an extra {@link ArrayList} of {@link String}s that contains the list of
6965
* recognition alternates from voice search, in order from highest to lowest confidence.
70-
*
71-
* @hide for making public in a later release
7266
*/
7367
public static final String EXTRA_VOICE_SEARCH_RESULT_STRINGS =
7468
"android.speech.extras.VOICE_SEARCH_RESULT_STRINGS";
@@ -81,8 +75,6 @@ private RecognizerResultsIntent() {
8175
* search url, that entry in this ArrayList should be <code>null</code>, and the implementor of
8276
* {@link #ACTION_VOICE_SEARCH_RESULTS} should execute a search of its own choosing,
8377
* based on the recognition result string.
84-
*
85-
* @hide for making public in a later release
8678
*/
8779
public static final String EXTRA_VOICE_SEARCH_RESULT_URLS =
8880
"android.speech.extras.VOICE_SEARCH_RESULT_URLS";
@@ -102,8 +94,6 @@ private RecognizerResultsIntent() {
10294
* uri or some other identifier. Anyone who reads this extra should confirm that a result is
10395
* in fact an "inline:" uri and back off to the urls or strings gracefully if it is not, thus
10496
* maintaining future backwards compatibility if this changes.
105-
*
106-
* @hide not to be exposed immediately as the implementation details may change
10797
*/
10898
public static final String EXTRA_VOICE_SEARCH_RESULT_HTML =
10999
"android.speech.extras.VOICE_SEARCH_RESULT_HTML";
@@ -116,8 +106,6 @@ private RecognizerResultsIntent() {
116106
* A list of the same size as {@link #EXTRA_VOICE_SEARCH_RESULT_STRINGS} may be provided
117107
* to apply different base urls to each different html result in the
118108
* {@link #EXTRA_VOICE_SEARCH_RESULT_HTML} list.
119-
*
120-
* @hide not to be exposed immediately as the implementation details may change
121109
*/
122110
public static final String EXTRA_VOICE_SEARCH_RESULT_HTML_BASE_URLS =
123111
"android.speech.extras.VOICE_SEARCH_RESULT_HTML_BASE_URLS";
@@ -132,16 +120,14 @@ private RecognizerResultsIntent() {
132120
* apply different HTTP headers to each different web result in the list. These headers will
133121
* only be used in the case that the url for a particular web result (from
134122
* {@link #EXTRA_VOICE_SEARCH_RESULT_URLS}) is loaded.
135-
*
136-
* @hide not to be exposed immediately as the implementation details may change
137123
*/
138124
public static final String EXTRA_VOICE_SEARCH_RESULT_HTTP_HEADERS =
139125
"android.speech.extras.EXTRA_VOICE_SEARCH_RESULT_HTTP_HEADERS";
140126

141127
/**
142128
* The scheme used currently for html content in {@link #EXTRA_VOICE_SEARCH_RESULT_HTML}.
143-
*
144-
* @hide not to be exposed immediately as the implementation details may change
129+
* Note that this should only be used in tandem with this particular extra; it should
130+
* NOT be used for generic URIs such as those found in the data field of an Intent.
145131
*/
146132
public static final String URI_SCHEME_INLINE = "inline";
147133
}

0 commit comments

Comments
 (0)