diff options
author | Bjorn Bringert <bringert@android.com> | 2011-03-03 00:18:23 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-03 00:18:23 -0800 |
commit | 268c7111f65c1f27598464c5f29ef4621bbf0407 (patch) | |
tree | 0e04cc684d1be0b8aceee93bae2e97fe2b024657 /core/java/android | |
parent | 4a85a7dc84407df8e92de4f89e7840af9e8dd3fc (diff) | |
parent | 940ef38c7c46565a8f8fdd6bb8e0183646d0abdc (diff) | |
download | frameworks_base-268c7111f65c1f27598464c5f29ef4621bbf0407.zip frameworks_base-268c7111f65c1f27598464c5f29ef4621bbf0407.tar.gz frameworks_base-268c7111f65c1f27598464c5f29ef4621bbf0407.tar.bz2 |
Merge "Pass AppData to the app from SearchDialog queries."
Diffstat (limited to 'core/java/android')
-rw-r--r-- | core/java/android/app/SearchDialog.java | 1 | ||||
-rw-r--r-- | core/java/android/widget/SearchView.java | 13 |
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); |