Merge "Pass AppData to the app from SearchDialog queries."

2 files changed, 14 insertions, 0 deletions

diff --git a/core/java/android/app/SearchDialog.java b/core/java/android/app/SearchDialog.java
index e95a23d..db8d5e9 100644
--- a/core/java/android/app/SearchDialog.java
+++ b/core/java/android/app/SearchDialog.java
@@ -255,6 +255,7 @@ public class SearchDialog extends Dialog {
             // of any bad state in the AutoCompleteTextView etc
             createContentView();
             mSearchView.setSearchableInfo(mSearchable);
+            mSearchView.setAppSearchData(mAppSearchData);
 
             show();
         }
diff --git a/core/java/android/widget/SearchView.java b/core/java/android/widget/SearchView.java
index 22edcd0..2d164fd 100644
--- a/core/java/android/widget/SearchView.java
+++ b/core/java/android/widget/SearchView.java
@@ -96,6 +96,7 @@ public class SearchView extends LinearLayout {
     private boolean mVoiceButtonEnabled;
 
     private SearchableInfo mSearchable;
+    private Bundle mAppSearchData;
 
     // For voice searching
     private final Intent mVoiceWebSearchIntent;
@@ -263,6 +264,15 @@ public class SearchView extends LinearLayout {
         updateViewsVisibility(mIconifiedByDefault);
     }
 
+    /**
+     * Sets the APP_DATA for legacy SearchDialog use.
+     * @param appSearchData bundle provided by the app when launching the search dialog
+     * @hide
+     */
+    public void setAppSearchData(Bundle appSearchData) {
+        mAppSearchData = appSearchData;
+    }
+
     /** @hide */
     @Override
     public boolean requestFocus(int direction, Rect previouslyFocusedRect) {
@@ -1115,6 +1125,9 @@ public class SearchView extends LinearLayout {
         if (extraData != null) {
             intent.putExtra(SearchManager.EXTRA_DATA_KEY, extraData);
         }
+        if (mAppSearchData != null) {
+            intent.putExtra(SearchManager.APP_DATA, mAppSearchData);
+        }
         if (actionKey != KeyEvent.KEYCODE_UNKNOWN) {
             intent.putExtra(SearchManager.ACTION_KEY, actionKey);
             intent.putExtra(SearchManager.ACTION_MSG, actionMsg);