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

Commit 355bd482 authored by Sam Gilbert's avatar Sam Gilbert
Browse files

Revert "Add entry and cursor location in GetSuggestionRequest" 

Revert submission 17128079-suggestionentry

Reason for revert: test monitor determined it broke tests: b/223859070
Reverted Changes:
I838896e2f:Add entry and cursor location in GetSuggestionRequ...
Ic9f5dd35b:Add cursorLocation and entry to GetSuggestRequest

Change-Id: I8a15f61c5ddb37b26d3e06de25f0d5b5b5c89abc
parent e395453b

src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java

+2 −4
Original line number Diff line number Diff line
@@ -100,14 +100,12 @@ public class AllAppsSearchBarController 
    @Override

    public void afterTextChanged(final Editable s) {

        mQuery = s.toString();

        mInput.getSelectionStart();

        if (mQuery.isEmpty()) {

            mSearchAlgorithm.cancel(true);

            mCallback.clearSearchResult();

        } else {

            mSearchAlgorithm.cancel(false);

            mSearchAlgorithm.doSearch(mQuery, mInput.getSelectionStart(), mTextConversions,

                    mCallback);

            mSearchAlgorithm.doSearch(mQuery, mTextConversions, mCallback);

        }

    }
@@ -117,7 +115,7 @@ public class AllAppsSearchBarController 
        }

        // If play store continues auto updating an app, we want to show partial result.

        mSearchAlgorithm.cancel(false);

        mSearchAlgorithm.doSearch(mQuery, mInput.getSelectionStart(), mCallback);

        mSearchAlgorithm.doSearch(mQuery, mCallback);

    }



    @Override

src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public class DefaultAppSearchAlgorithm implements SearchAlgorithm<AdapterItem> { 
    }



    @Override

    public void doSearch(String query, int cursorLocation, SearchCallback<AdapterItem> callback) {

    public void doSearch(String query, SearchCallback<AdapterItem> callback) {

        mAppState.getModel().enqueueModelUpdateTask(new BaseModelUpdateTask() {

            @Override

            public void execute(LauncherAppState app, BgDataModel dataModel, AllAppsList apps) {

src/com/android/launcher3/search/SearchAlgorithm.java

+3 −4
Original line number Diff line number Diff line
@@ -25,14 +25,13 @@ public interface SearchAlgorithm<T> { 
    /**

     * Performs search and sends the result to {@link SearchCallback}.

     */

    void doSearch(String query, int cursorLocation, SearchCallback<T> callback);

    void doSearch(String query, SearchCallback<T> callback);



    /**

     * Performs search with {@code query} and the {@code suggestedQueries}/

     */

    default void doSearch(String query, int cursorLocation, String[] suggestedQueries,

            SearchCallback<T> callback) {

        doSearch(query, cursorLocation, callback);

    default void doSearch(String query, String[] suggestedQueries, SearchCallback<T> callback) {

        doSearch(query, callback);

    }



    /**

src/com/android/launcher3/widget/picker/search/SimpleWidgetsSearchAlgorithm.java

+1 −2
Original line number Diff line number Diff line
@@ -48,8 +48,7 @@ public final class SimpleWidgetsSearchAlgorithm implements SearchAlgorithm<Widge 
    }



    @Override

    public void doSearch(String query, int cursorLocation,

            SearchCallback<WidgetsListBaseEntry> callback) {

    public void doSearch(String query, SearchCallback<WidgetsListBaseEntry> callback) {

        ArrayList<WidgetsListBaseEntry> result = getFilteredWidgets(mDataProvider, query);

        mResultHandler.post(() -> callback.onSearchResult(query, result));

    }

src/com/android/launcher3/widget/picker/search/WidgetsSearchBarController.java

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ public class WidgetsSearchBarController implements TextWatcher, 
        } else {

            mSearchAlgorithm.cancel(/* interruptActiveRequests= */ false);

            mSearchModeListener.enterSearchMode();

            mSearchAlgorithm.doSearch(mQuery, mInput.getSelectionStart(), this);

            mSearchAlgorithm.doSearch(mQuery, this);

            mCancelButton.setVisibility(VISIBLE);

        }

    }