diff options
| author | Mike LeBeau <mlebeau@android.com> | 2010-02-12 15:30:12 -0800 |
|---|---|---|
| committer | Mike LeBeau <mlebeau@android.com> | 2010-02-12 15:30:12 -0800 |
| commit | 0ffc570598b3f1503b5b7299db07da975e8264c4 (patch) | |
| tree | 6b1613ddb700286d2ded09f79dbc8412ad4a8e94 /core/java/android/app | |
| parent | 5741848d1ecd05b20385577585c177cd4cba831f (diff) | |
| download | frameworks_base-0ffc570598b3f1503b5b7299db07da975e8264c4.zip frameworks_base-0ffc570598b3f1503b5b7299db07da975e8264c4.tar.gz frameworks_base-0ffc570598b3f1503b5b7299db07da975e8264c4.tar.bz2 | |
Really fix the build - one more change to SearchDialog which shouldn't have
been submitted.
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/SearchDialog.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/app/SearchDialog.java b/core/java/android/app/SearchDialog.java index e4c1ba6..63e95c0 100644 --- a/core/java/android/app/SearchDialog.java +++ b/core/java/android/app/SearchDialog.java @@ -68,7 +68,6 @@ 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; @@ -95,6 +94,9 @@ 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"; @@ -946,7 +948,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(Recognition.EXTRA_CALLING_PACKAGE, + voiceIntent.putExtra(EXTRA_CALLING_PACKAGE, searchActivity == null ? null : searchActivity.toShortString()); // Add the values that configure forwarding the results |