summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Miranda <jonmiranda@google.com>2016-09-19 23:19:29 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-19 23:19:29 +0000
commitd450161a2edb6e85c0c57635daefa2ed5d018789 (patch)
tree0c848becc971561a7c1d416ee1b7ae8893128976
parent1fd8f378a9513317f0baf87e40053e9861d8aabe (diff)
parentbb918b3532f0f88177a9f38f55440121305c79ce (diff)
downloadandroid_packages_apps_Trebuchet-d450161a2edb6e85c0c57635daefa2ed5d018789.tar.gz
android_packages_apps_Trebuchet-d450161a2edb6e85c0c57635daefa2ed5d018789.tar.bz2
android_packages_apps_Trebuchet-d450161a2edb6e85c0c57635daefa2ed5d018789.zip
Only reset search field when back key is hit if there is no query.
am: bb918b3532 Change-Id: Icc66e5fcd8686b4280f4e21be8e1e6464cf9d874
-rw-r--r--src/com/android/launcher3/allapps/AllAppsSearchBarController.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsSearchBarController.java b/src/com/android/launcher3/allapps/AllAppsSearchBarController.java
index 41abb4c1d..365ab3185 100644
--- a/src/com/android/launcher3/allapps/AllAppsSearchBarController.java
+++ b/src/com/android/launcher3/allapps/AllAppsSearchBarController.java
@@ -127,10 +127,9 @@ public abstract class AllAppsSearchBarController
@Override
public boolean onBackKey() {
- // Only hide the search field if there is no query, or if there
- // are no filtered results
+ // Only hide the search field if there is no query
String query = Utilities.trim(mInput.getEditableText().toString());
- if (query.isEmpty() || mApps.hasNoFilteredResults()) {
+ if (query.isEmpty()) {
reset();
return true;
}