diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-05-27 15:15:14 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2011-05-27 15:53:36 -0700 |
| commit | 068d73cf51305a9dfc15c96f17a18676637d3e02 (patch) | |
| tree | cbf005d3ba8923145b0a89f82267cc03da5cdc8c /core/java/android/widget/SearchView.java | |
| parent | 098f5bd427574b2d80912d683a2d4c0ca23e998f (diff) | |
Keep track of USER_QUERY to pass to the intent.
Fixes bug: 3144023
Change-Id: Ib1f04119c7c0b5aa8ceaf7b15ccec70c76b2dff1
Diffstat (limited to 'core/java/android/widget/SearchView.java')
| -rw-r--r-- | core/java/android/widget/SearchView.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/widget/SearchView.java b/core/java/android/widget/SearchView.java index 9933d6872cd1..586ece841fc5 100644 --- a/core/java/android/widget/SearchView.java +++ b/core/java/android/widget/SearchView.java @@ -93,6 +93,7 @@ public class SearchView extends LinearLayout { private boolean mClearingFocus; private int mMaxWidth; private boolean mVoiceButtonEnabled; + private CharSequence mUserQuery; private SearchableInfo mSearchable; private Bundle mAppSearchData; @@ -372,6 +373,7 @@ public class SearchView extends LinearLayout { mQueryTextView.setText(query); if (query != null) { mQueryTextView.setSelection(query.length()); + mUserQuery = query; } // If the query is not empty and submit is requested, submit the query @@ -885,6 +887,7 @@ public class SearchView extends LinearLayout { private void onTextChanged(CharSequence newText) { CharSequence text = mQueryTextView.getText(); + mUserQuery = text; boolean hasText = !TextUtils.isEmpty(text); if (isSubmitButtonEnabled()) { updateSubmitButton(hasText); @@ -1124,7 +1127,7 @@ public class SearchView extends LinearLayout { if (data != null) { intent.setData(data); } - intent.putExtra(SearchManager.USER_QUERY, query); + intent.putExtra(SearchManager.USER_QUERY, mUserQuery); if (query != null) { intent.putExtra(SearchManager.QUERY, query); } |