Revert "Filter and display top 3 suggestions for exclusive type"

This reverts commit 70b634adcf.

Change-Id: I6de213d4c276696c6ccc9e992ff088cf507aa7ce
This commit is contained in:
Fan Zhang
2017-05-12 18:03:58 +00:00
parent 70b634adcf
commit 184ae963e7
6 changed files with 7 additions and 52 deletions

View File

@@ -41,13 +41,12 @@ import com.android.settings.dashboard.suggestions.SuggestionDismissController;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
import com.android.settings.dashboard.suggestions.SuggestionsChecks;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.SuggestionParser;
import com.android.settingslib.drawer.CategoryKey;
import com.android.settingslib.drawer.DashboardCategory;
import com.android.settingslib.drawer.SettingsDrawerActivity;
import com.android.settingslib.drawer.SettingsDrawerActivity.CategoryListener;
import com.android.settingslib.drawer.Tile;
import com.android.settingslib.suggestions.SuggestionList;
import com.android.settingslib.suggestions.SuggestionParser;
import java.util.ArrayList;
import java.util.List;
@@ -258,9 +257,7 @@ public class DashboardSummary extends InstrumentedFragment
final Context context = getContext();
boolean isSmartSuggestionEnabled =
mSuggestionFeatureProvider.isSmartSuggestionEnabled(context);
final SuggestionList sl = mSuggestionParser.getSuggestions(isSmartSuggestionEnabled);
final List<Tile> suggestions = sl.getSuggestions();
List<Tile> suggestions = mSuggestionParser.getSuggestions(isSmartSuggestionEnabled);
if (isSmartSuggestionEnabled) {
List<String> suggestionIds = new ArrayList<>(suggestions.size());
for (Tile suggestion : suggestions) {
@@ -278,9 +275,6 @@ public class DashboardSummary extends InstrumentedFragment
suggestions.remove(i--);
}
}
if (sl.isExclusiveSuggestionCategory()) {
mSuggestionFeatureProvider.filterExclusiveSuggestions(suggestions);
}
return suggestions;
}