diff --git a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java index 9f0c1cca65..2a16210861 100644 --- a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java +++ b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java @@ -192,27 +192,6 @@ public class AlphabeticalAppsList implement return true; } - public boolean appendSearchResults(ArrayList results) { - if (hasFilter() && results != null && results.size() > 0) { - updateSearchAdapterItems(results, mSearchResults.size()); - refreshRecyclerView(); - return true; - } - return false; - } - - void updateSearchAdapterItems(ArrayList list, int offset) { - for (int i = 0; i < list.size(); i++) { - AdapterItem adapterItem = list.get(i); - adapterItem.position = offset + i; - mAdapterItems.add(adapterItem); - - if (adapterItem.isCountedForAccessibility()) { - mAccessibilityResultsCount++; - } - } - } - /** * Updates internals when the set of apps are updated. */ @@ -282,7 +261,6 @@ public class AlphabeticalAppsList implement String lastSectionName = null; FastScrollSectionInfo lastFastScrollerSectionInfo = null; int position = 0; - int appIndex = 0; // Prepare to update the list of sections, filtered apps, etc. mAccessibilityResultsCount = 0; @@ -319,7 +297,16 @@ public class AlphabeticalAppsList implement mAdapterItems.add(appItem); } } else { - updateSearchAdapterItems(mSearchResults, 0); + int count = mSearchResults.size(); + for (int i = 0; i < count; i++) { + AdapterItem adapterItem = mSearchResults.get(i); + adapterItem.position = i; + mAdapterItems.add(adapterItem); + + if (adapterItem.isCountedForAccessibility()) { + mAccessibilityResultsCount++; + } + } if (!FeatureFlags.ENABLE_DEVICE_SEARCH.get()) { // Append the search market item if (hasNoFilteredResults()) { diff --git a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java index 893e547340..bc2c318ecb 100644 --- a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java +++ b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java @@ -176,14 +176,6 @@ public class AppsSearchContainerLayout extends ExtendedEditText } } - @Override - public void onAppendSearchResult(String query, ArrayList items) { - if (items != null) { - mApps.appendSearchResults(items); - notifyResultChanged(); - } - } - @Override public void clearSearchResult() { if (mApps.setSearchResults(null)) { diff --git a/src/com/android/launcher3/search/SearchCallback.java b/src/com/android/launcher3/search/SearchCallback.java index 5796116963..495a303a7e 100644 --- a/src/com/android/launcher3/search/SearchCallback.java +++ b/src/com/android/launcher3/search/SearchCallback.java @@ -31,13 +31,6 @@ public interface SearchCallback { */ void onSearchResult(String query, ArrayList items); - /** - * Called when the search from secondary source is complete. - * - * @param items list of search results - */ - void onAppendSearchResult(String query, ArrayList items); - /** * Called when the search results should be cleared. */ diff --git a/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarController.java b/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarController.java index 2751a52796..a15508a617 100644 --- a/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarController.java +++ b/src/com/android/launcher3/widget/picker/search/WidgetsSearchBarController.java @@ -94,11 +94,6 @@ public class WidgetsSearchBarController implements TextWatcher, mSearchModeListener.onSearchResults(items); } - @Override - public void onAppendSearchResult(String query, ArrayList items) { - // Not needed. - } - @Override public void clearSearchResult() { // Any existing search session will be cancelled by setting text to empty.