From 9c5c64891b4c23ba9628a73ba300aa0a31d95591 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Tue, 25 Sep 2018 13:16:59 -0700 Subject: [PATCH] Clean up: remove unused SuggestionFeature api. Test: robotests Change-Id: I91d06d93834674ca6019a86f8b3891198d424d7a --- .../suggestions/SuggestionFeatureProvider.java | 8 -------- .../SuggestionFeatureProviderImpl.java | 12 ------------ .../SuggestionFeatureProviderImplTest.java | 16 ---------------- 3 files changed, 36 deletions(-) diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java index 92744aee78c..00111770104 100644 --- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java +++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java @@ -23,11 +23,8 @@ import android.service.settings.suggestions.Suggestion; import androidx.annotation.NonNull; -import com.android.settingslib.drawer.Tile; import com.android.settingslib.suggestions.SuggestionControllerMixinCompat; -import java.util.List; - /** Interface should be implemented if you have added new suggestions */ public interface SuggestionFeatureProvider { @@ -49,11 +46,6 @@ public interface SuggestionFeatureProvider { */ SharedPreferences getSharedPrefs(Context context); - /** - * Only keep top few suggestions from exclusive suggestions. - */ - void filterExclusiveSuggestions(List suggestions); - /** * Dismisses a suggestion. */ diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java index 4dd0a5c4576..39d0299c0f5 100644 --- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java +++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java @@ -45,7 +45,6 @@ import java.util.List; public class SuggestionFeatureProviderImpl implements SuggestionFeatureProvider { private static final String TAG = "SuggestionFeature"; - private static final int EXCLUSIVE_SUGGESTION_MAX_COUNT = 3; private static final String SHARED_PREF_FILENAME = "suggestions"; @@ -97,17 +96,6 @@ public class SuggestionFeatureProviderImpl implements SuggestionFeatureProvider .getMetricsFeatureProvider(); } - @Override - public void filterExclusiveSuggestions(List suggestions) { - if (suggestions == null) { - return; - } - for (int i = suggestions.size() - 1; i >= EXCLUSIVE_SUGGESTION_MAX_COUNT; i--) { - Log.d(TAG, "Removing exclusive suggestion"); - suggestions.remove(i); - } - } - @Override public void dismissSuggestion(Context context, SuggestionControllerMixinCompat mixin, Suggestion suggestion) { diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java index 5fdf4586053..f9a737942a2 100644 --- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java @@ -143,20 +143,4 @@ public class SuggestionFeatureProviderImplTest { anyString()); verify(mSuggestionControllerMixin).dismissSuggestion(mSuggestion); } - - @Test - public void filterExclusiveSuggestions_shouldOnlyKeepFirst3() { - final List suggestions = new ArrayList<>(); - suggestions.add(new Tile(mActivityInfo, CategoryKey.CATEGORY_APPS)); - suggestions.add(new Tile(mActivityInfo, CategoryKey.CATEGORY_APPS)); - suggestions.add(new Tile(mActivityInfo, CategoryKey.CATEGORY_APPS)); - suggestions.add(new Tile(mActivityInfo, CategoryKey.CATEGORY_APPS)); - suggestions.add(new Tile(mActivityInfo, CategoryKey.CATEGORY_APPS)); - suggestions.add(new Tile(mActivityInfo, CategoryKey.CATEGORY_APPS)); - suggestions.add(new Tile(mActivityInfo, CategoryKey.CATEGORY_APPS)); - - mProvider.filterExclusiveSuggestions(suggestions); - - assertThat(suggestions).hasSize(3); - } }