Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0b0d461 authored by Sunny Shao's avatar Sunny Shao
Browse files

Remove the isCustomCard and related codes 

Bug: 143058171
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.homepage
Change-Id: I9d9ab16f327aef65599150e2f58b23bcb9986b30
parent 2eb9ef4d

src/com/android/settings/homepage/contextualcards/ContextualCard.java

+0 −4
Original line number Diff line number Diff line
@@ -115,10 +115,6 @@ public class ContextualCard { 
        return mIsLargeCard;

    }



    boolean isCustomCard() {

        return TextUtils.isEmpty(mSliceUri);

    }



    public int getViewType() {

        return mViewType;

    }

src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java

+1 −3
Original line number Diff line number Diff line
@@ -112,9 +112,7 @@ public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard> 
            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);

src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java

+0 −3
Original line number Diff line number Diff line
@@ -88,9 +88,6 @@ public class EligibleCardChecker implements Callable<ContextualCard> { 
        if (card.getRankingScore() < 0) {

            return false;

        }

        if (card.isCustomCard()) {

            return true;

        }



        final Uri uri = card.getSliceUri();

        if (!ContentResolver.SCHEME_CONTENT.equals(uri.getScheme())) {

tests/robotests/src/com/android/settings/homepage/contextualcards/EligibleCardCheckerTest.java

+0 −12
Original line number Diff line number Diff line
@@ -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");