commit a1cc3fdce19a336c251297c61cd83ac6cf767cd1
author Leon Scroggins <scroggo@google.com> Mon Feb 01 16:14:11 2010 -0500
committer Leon Scroggins <scroggo@google.com> Mon Feb 01 16:53:47 2010 -0500
tree 943da2e0836557314fecd1a0a6ca5590b21a118b
parent 0a1d838ccd16ac08300bb8ac89b61ee0c956a49b

Use the constants defined in RecognizerResultsIntent for voice search.

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 3f7c9e9..6167b9a 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -67,6 +67,7 @@
 import android.provider.ContactsContract.Intents.Insert;
 import android.provider.Downloads;
 import android.provider.MediaStore;
+import android.speech.RecognizerResultsIntent;
 import android.text.IClipboard;
 import android.text.TextUtils;
 import android.text.format.DateFormat;
@@ -387,7 +388,8 @@
             final Tab t = mTabControl.createNewTab(
                     (Intent.ACTION_VIEW.equals(action) &&
                     intent.getData() != null)
-                    || Tab.VoiceSearchData.VOICE_SEARCH_RESULTS.equals(action),
+                    || RecognizerResultsIntent.ACTION_VOICE_SEARCH_RESULTS
+                    .equals(action),
                     intent.getStringExtra(Browser.EXTRA_APPLICATION_ID), urlData.mUrl);
             mTabControl.setCurrentTab(t);
             attachTabToContentView(t);
@@ -470,8 +472,8 @@
             // just resume the browser
             return;
         }
-        boolean activateVoiceSearch = Tab.VoiceSearchData.VOICE_SEARCH_RESULTS
-                .equals(action);
+        boolean activateVoiceSearch = RecognizerResultsIntent
+                .ACTION_VOICE_SEARCH_RESULTS.equals(action);
         if (Intent.ACTION_VIEW.equals(action)
                 || Intent.ACTION_SEARCH.equals(action)
                 || MediaStore.INTENT_ACTION_MEDIA_SEARCH.equals(action)
@@ -596,7 +598,8 @@
 
         String url = null;
         final String action = intent.getAction();
-        if (Tab.VoiceSearchData.VOICE_SEARCH_RESULTS.equals(action)) {
+        if (RecognizerResultsIntent.ACTION_VOICE_SEARCH_RESULTS.equals(
+                action)) {
             return false;
         }
         if (Intent.ACTION_VIEW.equals(action)) {
@@ -3950,8 +3953,8 @@
         UrlData(String url, Map<String, String> headers, Intent intent) {
             this.mUrl = url;
             this.mHeaders = headers;
-            if (Tab.VoiceSearchData.VOICE_SEARCH_RESULTS.equals(
-                    intent.getAction())) {
+            if (RecognizerResultsIntent.ACTION_VOICE_SEARCH_RESULTS
+                    .equals(intent.getAction())) {
                 this.mVoiceIntent = intent;
             } else {
                 this.mVoiceIntent = null;