From 479be0d5ff2f12cb555b66a14190c50383da46e8 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Tue, 25 Sep 2018 13:44:30 -0700 Subject: [PATCH] Remove check to limit suggestions to 2 This is already enforced from SuggestionService side. Test: rebuild/robotests Change-Id: Icd5faa3b7114b369d96459b00b43d4e7eaeae5c5 --- .../settings/dashboard/DashboardData.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/com/android/settings/dashboard/DashboardData.java b/src/com/android/settings/dashboard/DashboardData.java index db296ab7470..5265b82ae92 100644 --- a/src/com/android/settings/dashboard/DashboardData.java +++ b/src/com/android/settings/dashboard/DashboardData.java @@ -41,7 +41,6 @@ import java.util.List; */ public class DashboardData { public static final int POSITION_NOT_FOUND = -1; - public static final int MAX_SUGGESTION_COUNT = 2; // stable id for different type of items. @VisibleForTesting @@ -185,7 +184,7 @@ public class DashboardData { final List conditions = mConditions; final boolean hasConditions = sizeOf(conditions) > 0; - final List suggestions = getSuggestionsToShow(mSuggestions); + final List suggestions = mSuggestions; final boolean hasSuggestions = sizeOf(suggestions) > 0; /* Suggestion container. This is the card view that contains the list of suggestions. @@ -225,20 +224,6 @@ public class DashboardData { return list == null ? 0 : list.size(); } - private List getSuggestionsToShow(List suggestions) { - if (suggestions == null) { - return null; - } - if (suggestions.size() <= MAX_SUGGESTION_COUNT) { - return suggestions; - } - final List suggestionsToShow = new ArrayList<>(MAX_SUGGESTION_COUNT); - for (int i = 0; i < MAX_SUGGESTION_COUNT; i++) { - suggestionsToShow.add(suggestions.get(i)); - } - return suggestionsToShow; - } - /** * Builder used to build the ItemsData */