Merge "Remove two redundant layout pass in AllAppsTransitionController." into ub-launcher3-calgary
diff --git a/src/com/android/launcher3/allapps/AllAppsSearchBarController.java b/src/com/android/launcher3/allapps/AllAppsSearchBarController.java
index 7746245..b965d74 100644
--- a/src/com/android/launcher3/allapps/AllAppsSearchBarController.java
+++ b/src/com/android/launcher3/allapps/AllAppsSearchBarController.java
@@ -140,10 +140,11 @@
* Resets the search bar state.
*/
public void reset() {
- mQuery = null;
unfocusSearchField();
mCb.clearSearchResult();
mInput.setText("");
+ // We need to reset this after we clear the input text
+ mQuery = null;
hideKeyboard();
}