am 25ad9e4e: Merge "Give GEL a way to clear the typed text when it starts searching" into ub-now-porkchop

* commit '25ad9e4ee53110405cabf2fdb34d4412372532d1': Give GEL a way to clear the typed text when it starts searching
2014-09-02 11:38:04 +00:00
parent b17186c7a4 25ad9e4ee5
commit e4ad507079
1 changed files with 13 additions and 2 deletions
@@ -2064,14 +2064,25 @@ public class Launcher extends Activity
            sourceBounds = mSearchDropTargetBar.getSearchBarBounds();
        }

-        startSearch(initialQuery, selectInitialQuery,
+        boolean clearTextImmediately = startSearch(initialQuery, selectInitialQuery,
                appSearchData, sourceBounds);
+        if (clearTextImmediately) {
+            clearTypedText();
+        }
    }

-    public void startSearch(String initialQuery,
+    /**
+     * Start a text search.
+     *
+     * @return {@code true} if the search will start immediately, so any further keypresses
+     * will be handled directly by the search UI. {@code false} if {@link Launcher} should continue
+     * to buffer keypresses.
+     */
+    public boolean startSearch(String initialQuery,
            boolean selectInitialQuery, Bundle appSearchData, Rect sourceBounds) {
        startGlobalSearch(initialQuery, selectInitialQuery,
                appSearchData, sourceBounds);
+        return false;
    }

    /**