Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 047036e2 authored by Ian Parkinson's avatar Ian Parkinson
Browse files

Give GEL a way to clear the typed text when it starts searching 

...otherwise it'll be re-used every time the user starts a new
query. We take care not to change the way that typed text gets
cleared (in onWindowVisibilityChanged()) in other cases.

GEL will actually use this text in ag/537329. This CL will cause
the GEL build to break until that change is submitted, so
I'll be sure to submit them both close to each other.

Bug: 16953058
Change-Id: I7ed613e69eb7a38b1a5e6108715ca614b59fd24d
parent 2854d256

src/com/android/launcher3/Launcher.java

+13 −2
Original line number Diff line number Diff line
@@ -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;

    }



    /**