PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Sorting search results with TreeSet instead of Collection.sort"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-30 20:16:37 +00:00
committed by Android (Google) Code Review
parent a1bf76a69d cf66647a4e
commit 283895c03b
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/com/android/settings/search/SearchResultsAdapter.java
View File

@@ -45,6 +45,7 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.TreeSet;
public class SearchResultsAdapter extends RecyclerView.Adapter<SearchViewHolder> public class SearchResultsAdapter extends RecyclerView.Adapter<SearchViewHolder>
implements SearchResultsRankerCallback { implements SearchResultsRankerCallback {
@@ -312,22 +313,23 @@ public class SearchResultsAdapter extends RecyclerView.Adapter<SearchViewHolder>
int appSize = installedAppResults.size(); int appSize = installedAppResults.size();
final List<SearchResult> asyncRankingResults = new ArrayList<>(dbSize + appSize); final List<SearchResult> asyncRankingResults = new ArrayList<>(dbSize + appSize);
List<SearchResult> databaseResultsSortedByScores = new ArrayList<>(databaseResults); TreeSet<SearchResult> dbResultsSortedByScores = new TreeSet<>(
Collections.sort(databaseResultsSortedByScores, new Comparator<SearchResult>() { new Comparator<SearchResult>() {
@Override @Override
public int compare(SearchResult o1, SearchResult o2) { public int compare(SearchResult o1, SearchResult o2) {
float score1 = getRankingScoreByStableId(o1.stableId); float score1 = getRankingScoreByStableId(o1.stableId);
float score2 = getRankingScoreByStableId(o2.stableId); float score2 = getRankingScoreByStableId(o2.stableId);
if (score1 > score2) { if (score1 > score2) {
return -1; return -1;
} else if (score1 == score2) { } else if (score1 == score2) {
return 0; return 0;
} else { } else {
return 1; return 1;
} }
} }
}); });
asyncRankingResults.addAll(databaseResultsSortedByScores); dbResultsSortedByScores.addAll(databaseResults);
asyncRankingResults.addAll(dbResultsSortedByScores);
// App results are not ranked by async ranking and appended at the end of the list. // App results are not ranked by async ranking and appended at the end of the list.
asyncRankingResults.addAll(installedAppResults); asyncRankingResults.addAll(installedAppResults);
return asyncRankingResults; return asyncRankingResults;