commit a74d860aa3ac4e27c1938028fa663a25f71d9fbe
author Colin Cross <ccross@android.com> Thu Apr 11 14:35:23 2019 -0700
committer Colin Cross <ccross@android.com> Thu Apr 11 16:38:20 2019 -0700
tree 809c49b71e5165e8489e7abf4e5be79e372a8fc5
parent 07777f0a0fdf57cd3664b4739da09f50b0236be6

Update QuickSearchBox for guava 27.1

CharMatcher.WHITESPACE has been replaced with CharMatcher.whitespace().

Bug: 130306229
Test: m checkbuild
Change-Id: I9196cddee5e0fb08dee6c6fa868cdb33c43c1888

src/com/android/quicksearchbox/SearchActivity.java

diff --git a/src/com/android/quicksearchbox/SearchActivity.java b/src/com/android/quicksearchbox/SearchActivity.java
index 050fc89..ff21a17 100644
--- a/src/com/android/quicksearchbox/SearchActivity.java
+++ b/src/com/android/quicksearchbox/SearchActivity.java
@@ -328,7 +328,7 @@
      * @return true if a search was performed as a result of this click, false otherwise.
      */
     protected boolean onSearchClicked(int method) {
-        String query = CharMatcher.WHITESPACE.trimAndCollapseFrom(getQuery(), ' ');
+        String query = CharMatcher.whitespace().trimAndCollapseFrom(getQuery(), ' ');
         if (DBG) Log.d(TAG, "Search clicked, query=" + query);
 
         // Don't do empty queries
@@ -471,7 +471,7 @@
 
     public void updateSuggestions() {
         if (DBG) Log.d(TAG, "updateSuggestions()");
-        final String query = CharMatcher.WHITESPACE.trimLeadingFrom(getQuery());
+        final String query = CharMatcher.whitespace().trimLeadingFrom(getQuery());
         updateSuggestions(query, mSource);
     }