summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-09-04 11:44:00 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-04 11:44:00 -0700
commitb788556bfde48c1f94c46bda4f4b8d576d5cfb81 (patch)
tree958b0c1e242b632762e8a713e4d0ee775dc90f0d
parentb4597aaea48cbac9dfc38d02059808e74897698a (diff)
parentad17717e52576a05dffd1b99c06c46a80c149722 (diff)
downloadframeworks_base-b788556bfde48c1f94c46bda4f4b8d576d5cfb81.zip
frameworks_base-b788556bfde48c1f94c46bda4f4b8d576d5cfb81.tar.gz
frameworks_base-b788556bfde48c1f94c46bda4f4b8d576d5cfb81.tar.bz2
am ad17717e: am d3b74b91: am b307ceb4: Merge "SearchWidget: passing APP_DATA to voice intent"
* commit 'ad17717e52576a05dffd1b99c06c46a80c149722': SearchWidget: passing APP_DATA to voice intent
-rw-r--r--core/java/android/widget/SearchView.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/widget/SearchView.java b/core/java/android/widget/SearchView.java
index a30567f..9b62a51 100644
--- a/core/java/android/widget/SearchView.java
+++ b/core/java/android/widget/SearchView.java
@@ -1517,6 +1517,9 @@ public class SearchView extends LinearLayout implements CollapsibleActionView {
// because the voice search activity will always need to insert "QUERY" into
// it anyway.
Bundle queryExtras = new Bundle();
+ if (mAppSearchData != null) {
+ queryExtras.putParcelable(SearchManager.APP_DATA, mAppSearchData);
+ }
// Now build the intent to launch the voice search. Add all necessary
// extras to launch the voice recognizer, and then all the necessary extras