diff options
author | Jonathan Miranda <jonmiranda@google.com> | 2016-09-19 23:08:42 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-09-19 23:08:42 +0000 |
commit | 6a7ca92f726968b5301444131bf75ca74e934788 (patch) | |
tree | c91a1323c707a5e2a25228a6469e9422d1bc689a /src | |
parent | 41be5cdea5b21c496aadffb6ad4793f6bffd77fe (diff) | |
parent | bb918b3532f0f88177a9f38f55440121305c79ce (diff) | |
download | android_packages_apps_Trebuchet-6a7ca92f726968b5301444131bf75ca74e934788.tar.gz android_packages_apps_Trebuchet-6a7ca92f726968b5301444131bf75ca74e934788.tar.bz2 android_packages_apps_Trebuchet-6a7ca92f726968b5301444131bf75ca74e934788.zip |
Merge "Only reset search field when back key is hit if there is no query." into ub-launcher3-calgary-polish
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/allapps/AllAppsSearchBarController.java | 5 |
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; } |