Merge "Add RecognizerIntent.ACTION_VOICE_SEARCH_SETTINGS, which we'll trigger from system settings. For now it'll just be triggered from within the voice search app if you choose the settings menu item."

1 files changed, 8 insertions, 0 deletions

diff --git a/core/java/android/speech/RecognizerIntent.java b/core/java/android/speech/RecognizerIntent.java
index 987e763160de..6c5f91232385 100644
--- a/core/java/android/speech/RecognizerIntent.java
+++ b/core/java/android/speech/RecognizerIntent.java
@@ -154,4 +154,12 @@ public class RecognizerIntent {
      * {@link #ACTION_RECOGNIZE_SPEECH}. Only present when {@link Activity#RESULT_OK} is returned.
      */
     public static final String EXTRA_RESULTS = "android.speech.extra.RESULTS";
+    
+    /**
+     * Triggers the voice search settings activity.
+     * 
+     * @hide pending API council approval, to be unhidden for Froyo
+     */
+    public static final String ACTION_VOICE_SEARCH_SETTINGS =
+            "android.speech.action.VOICE_SEARCH_SETTINGS";
 }