diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCard.java b/src/com/android/settings/homepage/contextualcards/ContextualCard.java index 0269c0e36a9..262cd2fd971 100644 --- a/src/com/android/settings/homepage/contextualcards/ContextualCard.java +++ b/src/com/android/settings/homepage/contextualcards/ContextualCard.java @@ -115,10 +115,6 @@ public class ContextualCard { return mIsLargeCard; } - boolean isCustomCard() { - return TextUtils.isEmpty(mSliceUri); - } - public int getViewType() { return mViewType; } diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java b/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java index 17a226ddca7..40df2240015 100644 --- a/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java +++ b/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java @@ -112,9 +112,7 @@ public class ContextualCardLoader extends AsyncLoaderCompat if (cursor.getCount() > 0) { for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) { final ContextualCard card = new ContextualCard(cursor); - if (card.isCustomCard()) { - //TODO(b/114688391): Load and generate custom card,then add into list - } else if (isLargeCard(card)) { + if (isLargeCard(card)) { result.add(card.mutate().setIsLargeCard(true).build()); } else { result.add(card); diff --git a/src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java b/src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java index 8558ee79566..0fcde265696 100644 --- a/src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java +++ b/src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java @@ -88,9 +88,6 @@ public class EligibleCardChecker implements Callable { if (card.getRankingScore() < 0) { return false; } - if (card.isCustomCard()) { - return true; - } final Uri uri = card.getSliceUri(); if (!ContentResolver.SCHEME_CONTENT.equals(uri.getScheme())) { diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/EligibleCardCheckerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/EligibleCardCheckerTest.java index 37779202d3c..23ae2f3a75c 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/EligibleCardCheckerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/EligibleCardCheckerTest.java @@ -75,18 +75,6 @@ public class EligibleCardCheckerTest { assertThat(mEligibleCardChecker.mCard.hasInlineAction()).isTrue(); } - @Test - public void isCardEligibleToDisplay_customCard_returnTrue() { - final ContextualCard customCard = new ContextualCard.Builder() - .setName("custom_card") - .setCardType(ContextualCard.CardType.DEFAULT) - .setTitleText("custom_title") - .setSummaryText("custom_summary") - .build(); - - assertThat(mEligibleCardChecker.isCardEligibleToDisplay(customCard)).isTrue(); - } - @Test public void isCardEligibleToDisplay_invalidScheme_returnFalse() { final Uri sliceUri = Uri.parse("contet://com.android.settings.slices/action/flashlight");