summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-09-04 10:49:48 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-09-04 10:49:48 -0700
commitb307ceb43fa96e8d54851c20278a4344469c9269 (patch)
treea96823aef7e6ee0722e2c99006ad53e696c8ae8a
parent0dab1a198e19c9993897b031d425a61a3bfec562 (diff)
parent1bcfe84179417cda57176fe8661a4a749cb843b6 (diff)
downloadframeworks_base-b307ceb43fa96e8d54851c20278a4344469c9269.zip
frameworks_base-b307ceb43fa96e8d54851c20278a4344469c9269.tar.gz
frameworks_base-b307ceb43fa96e8d54851c20278a4344469c9269.tar.bz2
Merge "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 c44ce8a..86433d4 100644
--- a/core/java/android/widget/SearchView.java
+++ b/core/java/android/widget/SearchView.java
@@ -1506,6 +1506,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