diff options
author | Amith Yamasani <yamasani@google.com> | 2011-07-27 10:54:15 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-27 10:54:15 -0700 |
commit | 84935dc2c00bcc7f6a05370f8fbbd0232a6eb40b (patch) | |
tree | ed56a40583d590869b4798e630ed63c2e8fc0e0f | |
parent | 377fe393298039e4ea8407451b9afe0475d136a0 (diff) | |
parent | f28d1875741d1845df45808e143f3a850e66f893 (diff) | |
download | frameworks_base-84935dc2c00bcc7f6a05370f8fbbd0232a6eb40b.zip frameworks_base-84935dc2c00bcc7f6a05370f8fbbd0232a6eb40b.tar.gz frameworks_base-84935dc2c00bcc7f6a05370f8fbbd0232a6eb40b.tar.bz2 |
Merge "Make sure that suggestions are queried on focus or tapping."
-rw-r--r-- | core/java/android/widget/SearchView.java | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/core/java/android/widget/SearchView.java b/core/java/android/widget/SearchView.java index 763a064..91b19ed 100644 --- a/core/java/android/widget/SearchView.java +++ b/core/java/android/widget/SearchView.java @@ -221,6 +221,7 @@ public class SearchView extends LinearLayout implements CollapsibleActionView { mCloseButton.setOnClickListener(mOnClickListener); mSubmitButton.setOnClickListener(mOnClickListener); mVoiceButton.setOnClickListener(mOnClickListener); + mQueryTextView.setOnClickListener(mOnClickListener); mQueryTextView.addTextChangedListener(mTextWatcher); mQueryTextView.setOnEditorActionListener(mOnEditorActionListener); @@ -319,7 +320,9 @@ public class SearchView extends LinearLayout implements CollapsibleActionView { // If it is not iconified, then give the focus to the text field if (!isIconified()) { boolean result = mQueryTextView.requestFocus(direction, previouslyFocusedRect); - if (result) updateViewsVisibility(false); + if (result) { + updateViewsVisibility(false); + } return result; } else { return super.requestFocus(direction, previouslyFocusedRect); @@ -681,6 +684,8 @@ public class SearchView extends LinearLayout implements CollapsibleActionView { onSubmitQuery(); } else if (v == mVoiceButton) { onVoiceClicked(); + } else if (v == mQueryTextView) { + forceSuggestionQuery(); } } }; @@ -1029,6 +1034,9 @@ public class SearchView extends LinearLayout implements CollapsibleActionView { void onTextFocusChanged() { updateViewsVisibility(isIconified()); updateFocusedState(mQueryTextView.hasFocus()); + if (mQueryTextView.hasFocus()) { + forceSuggestionQuery(); + } } @Override @@ -1377,6 +1385,11 @@ public class SearchView extends LinearLayout implements CollapsibleActionView { } } + private void forceSuggestionQuery() { + mQueryTextView.doBeforeTextChanged(); + mQueryTextView.doAfterTextChanged(); + } + static boolean isLandscapeMode(Context context) { return context.getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE; |