summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2016-08-04 17:12:27 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-08-04 17:12:27 +0000
commit49a1ab90063cf8c37823e0409d50868a2c960ba6 (patch)
treec4912330fa308e03410ba357e4845fbcee3b7cdd
parentce231c53bad8d3b2f84228750debbed3419cd862 (diff)
parent45a11dd9ee5c9cdaa65527ae0ef1c8b004417f28 (diff)
downloadandroid_packages_apps_Trebuchet-49a1ab90063cf8c37823e0409d50868a2c960ba6.tar.gz
android_packages_apps_Trebuchet-49a1ab90063cf8c37823e0409d50868a2c960ba6.tar.bz2
android_packages_apps_Trebuchet-49a1ab90063cf8c37823e0409d50868a2c960ba6.zip
Merge "Prevent refreshing app search results with empty query." into ub-launcher3-calgary
-rw-r--r--src/com/android/launcher3/allapps/AllAppsSearchBarController.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsSearchBarController.java b/src/com/android/launcher3/allapps/AllAppsSearchBarController.java
index b965d744f..9a48367cd 100644
--- a/src/com/android/launcher3/allapps/AllAppsSearchBarController.java
+++ b/src/com/android/launcher3/allapps/AllAppsSearchBarController.java
@@ -20,6 +20,7 @@ import android.content.Intent;
import android.graphics.Rect;
import android.net.Uri;
import android.text.Editable;
+import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.KeyEvent;
import android.view.View;
@@ -102,7 +103,7 @@ public abstract class AllAppsSearchBarController
}
protected void refreshSearchResult() {
- if (mQuery == null) {
+ if (TextUtils.isEmpty(mQuery)) {
return;
}
// If play store continues auto updating an app, we want to show partial result.
@@ -143,7 +144,6 @@ public abstract class AllAppsSearchBarController
unfocusSearchField();
mCb.clearSearchResult();
mInput.setText("");
- // We need to reset this after we clear the input text
mQuery = null;
hideKeyboard();
}