From 6a7421ba94b1fca0a20ddf146054ebd771ee471e Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Wed, 27 Jul 2011 11:55:53 -0700 Subject: Don't submit a query if it's whitespace only. Just to maintain backward compatibility. It's not documented that a space is not a valid query, but it does make sense to expect that. Bug: 5079755 Also avoid showing an x by an empty query, by having the SearchDialog simulate an ActionBar. Change-Id: I3a9332286a439b659e179a249587c491ef29e5c1 --- core/java/android/widget/SearchView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/java/android/widget/SearchView.java') diff --git a/core/java/android/widget/SearchView.java b/core/java/android/widget/SearchView.java index 55b73dffb4a6..53fd6ad47ceb 100644 --- a/core/java/android/widget/SearchView.java +++ b/core/java/android/widget/SearchView.java @@ -958,7 +958,7 @@ public class SearchView extends LinearLayout implements CollapsibleActionView { private void onSubmitQuery() { CharSequence query = mQueryTextView.getText(); - if (!TextUtils.isEmpty(query)) { + if (query != null && TextUtils.getTrimmedLength(query) > 0) { if (mOnQueryChangeListener == null || !mOnQueryChangeListener.onQueryTextSubmit(query.toString())) { if (mSearchable != null) { -- cgit v1.2.3