diff options
| author | Mike LeBeau <mlebeau@android.com> | 2010-02-16 16:10:09 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-16 16:10:09 -0800 |
| commit | 4b71fc0fa8dee98764b55aefc176599bd982f53e (patch) | |
| tree | 8d741e4586a9659ee02b86fc69b9d7c4e91bfa47 /core/java/android/app | |
| parent | 044a401292846098e3d40977be1346b6ce7ea327 (diff) | |
| parent | c2fd9adf0e804edf530d1cfc805d0c20e8d42c8e (diff) | |
| download | frameworks_base-4b71fc0fa8dee98764b55aefc176599bd982f53e.zip frameworks_base-4b71fc0fa8dee98764b55aefc176599bd982f53e.tar.gz frameworks_base-4b71fc0fa8dee98764b55aefc176599bd982f53e.tar.bz2 | |
Merge "Add constant to android-common for voice search's EXTRA_CALLING_PACKAGE, and use it from SearchDialog."
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/SearchDialog.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/java/android/app/SearchDialog.java b/core/java/android/app/SearchDialog.java index 63e95c0..e4c1ba6 100644 --- a/core/java/android/app/SearchDialog.java +++ b/core/java/android/app/SearchDialog.java @@ -68,6 +68,7 @@ import android.widget.AdapterView.OnItemClickListener; import android.widget.AdapterView.OnItemSelectedListener; import com.android.common.Patterns; +import com.android.common.speech.Recognition; import java.util.ArrayList; import java.util.WeakHashMap; @@ -94,9 +95,6 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS private static final String INSTANCE_KEY_PREVIOUS_COMPONENTS = "sPrev"; private static final String INSTANCE_KEY_USER_QUERY = "uQry"; - // The extra key used in an intent to the speech recognizer for in-app voice search. - private static final String EXTRA_CALLING_PACKAGE = "calling_package"; - // The string used for privateImeOptions to identify to the IME that it should not show // a microphone button since one already exists in the search dialog. private static final String IME_OPTION_NO_MICROPHONE = "nm"; @@ -948,7 +946,7 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS voiceIntent.putExtra(RecognizerIntent.EXTRA_PROMPT, prompt); voiceIntent.putExtra(RecognizerIntent.EXTRA_LANGUAGE, language); voiceIntent.putExtra(RecognizerIntent.EXTRA_MAX_RESULTS, maxResults); - voiceIntent.putExtra(EXTRA_CALLING_PACKAGE, + voiceIntent.putExtra(Recognition.EXTRA_CALLING_PACKAGE, searchActivity == null ? null : searchActivity.toShortString()); // Add the values that configure forwarding the results |