added hands-free intent parameter, might not work for all devices

gast-lib · Mar 21, 2013 · 467ed71 · 467ed71
1 parent 7f4b3bf
commit 467ed71
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 1 deletion.
diff --git a/app/res/values/pref_strings.xml b/app/res/values/pref_strings.xml
@@ -15,6 +15,10 @@
     <string name="pref_websearch_title">Web Search</string>
     <string name="pref_websearch_default">false</string>
 
+    <string name="pref_handsfree">pref_handsfree</string>
+    <string name="pref_handsfree_title">Hands Free</string>
+    <string name="pref_handsfree_default">false</string>
+
     <string name="pref_direct">pref_direct</string>
     <string name="pref_direct_title">Use SpeechRecognizer</string>
     <string name="pref_direct_default">false</string>

diff --git a/app/res/xml/speech_preferences.xml b/app/res/xml/speech_preferences.xml
@@ -34,6 +34,11 @@
             android:key="@string/pref_websearch"
             android:title="@string/pref_websearch_title" />
 
+        <CheckBoxPreference
+            android:defaultValue="@string/pref_handsfree_default"
+            android:key="@string/pref_handsfree"
+            android:title="@string/pref_handsfree_title" />
+
         <CheckBoxPreference
             android:defaultValue="@string/pref_direct_default"
             android:key="@string/pref_direct"

diff --git a/app/src/root/gast/playground/speech/SpeechRecognitionPlay.java b/app/src/root/gast/playground/speech/SpeechRecognitionPlay.java
@@ -514,6 +514,9 @@ private Intent readRecognizerIntentFromPreferences()
 
         //web search handling
         boolean isWebSearchAction = preferences.getBoolean(this, R.string.pref_websearch, R.string.pref_websearch_default);
+
+        boolean isHandsFreeAction = preferences.getBoolean(this, R.string.pref_handsfree, R.string.pref_handsfree_default);
+
         if (isWebSearchAction)
         {
             intentToSend = RecognizerIntentFactory.getWebSearchRecognizeIntent();
@@ -525,7 +528,14 @@ private Intent readRecognizerIntentFromPreferences()
         }
         else
         {
-            intentToSend = RecognizerIntentFactory.getBlankRecognizeIntent();
+            if (isHandsFreeAction && Build.VERSION.SDK_INT >= 16)
+            {
+                intentToSend = RecognizerIntentFactory.getHandsFreeRecognizeIntent();
+            }
+            else
+            {
+                intentToSend = RecognizerIntentFactory.getBlankRecognizeIntent();
+            }
         }
 
         //language model

diff --git a/library/src/root/gast/speech/RecognizerIntentFactory.java b/library/src/root/gast/speech/RecognizerIntentFactory.java
@@ -49,6 +49,12 @@ public static Intent getWebSearchRecognizeIntent()
         return intent;
     }
 
+    public static Intent getHandsFreeRecognizeIntent()
+    {
+        Intent intent = new Intent(RecognizerIntent.ACTION_VOICE_SEARCH_HANDS_FREE);
+        return intent;
+    }
+
     public static Intent getPossilbeWebSearchRecognizeIntent(String prompt)
     {
         Intent intent = new Intent(RecognizerIntent.ACTION_WEB_SEARCH);