diff options
author | Andrew Lee <anwlee@google.com> | 2015-10-26 22:29:33 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-26 22:29:33 +0000 |
commit | a269fec7002f6be4614cd95dcb6974f18d34d775 (patch) | |
tree | 350bae0b52da20bad4a94a492afefdf889cd6478 | |
parent | c58c53f9bf497f891e857da4b55a02b594082da6 (diff) | |
parent | 88fe8be5a8836cb8ac3125db26d1dcc327abd3e2 (diff) |
Merge "Show list of all phone numbers for empty query." into ub-contactsdialer-a-dev
-rw-r--r-- | src/com/android/dialer/list/BlockedListSearchFragment.java | 12 | ||||
-rw-r--r-- | src/com/android/dialer/list/RegularSearchFragment.java | 5 |
2 files changed, 5 insertions, 12 deletions
diff --git a/src/com/android/dialer/list/BlockedListSearchFragment.java b/src/com/android/dialer/list/BlockedListSearchFragment.java index 961ce39e6..8fc6f7adb 100644 --- a/src/com/android/dialer/list/BlockedListSearchFragment.java +++ b/src/com/android/dialer/list/BlockedListSearchFragment.java @@ -48,7 +48,6 @@ public class BlockedListSearchFragment extends RegularSearchFragment private FilteredNumberAsyncQueryHandler mFilteredNumberAsyncQueryHandler; private EditText mSearchView; - private String mSearchQuery; private final TextWatcher mPhoneSearchQueryTextListener = new TextWatcher() { @Override @@ -57,12 +56,7 @@ public class BlockedListSearchFragment extends RegularSearchFragment @Override public void onTextChanged(CharSequence s, int start, int before, int count) { - final String newText = s.toString(); - if (newText.equals(mSearchQuery)) { - return; - } - mSearchQuery = newText; - setQueryString(mSearchQuery, false); + setQueryString(s.toString(), false); } @Override @@ -86,6 +80,10 @@ public class BlockedListSearchFragment extends RegularSearchFragment @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + + // Show list of all phone numbers when search query is empty. + setShowEmptyListForNullQuery(false); + mFilteredNumberAsyncQueryHandler = new FilteredNumberAsyncQueryHandler( getContext().getContentResolver()); } diff --git a/src/com/android/dialer/list/RegularSearchFragment.java b/src/com/android/dialer/list/RegularSearchFragment.java index 6b89ef0a3..ed88d8355 100644 --- a/src/com/android/dialer/list/RegularSearchFragment.java +++ b/src/com/android/dialer/list/RegularSearchFragment.java @@ -60,11 +60,6 @@ public class RegularSearchFragment extends SearchFragment AnalyticsUtil.sendScreenView(this); } - @Override - public void onDetach() { - super.onDetach(); - } - public void configureDirectorySearch() { setDirectorySearchEnabled(true); setDirectoryResultLimit(SEARCH_DIRECTORY_RESULT_LIMIT); |