PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove the isCustomCard and related codes"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-15 07:26:35 +00:00
committed by Android (Google) Code Review
parent e5cdb3a9ac f0b0d46106
commit 00596b03a5
4 changed files with 1 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/homepage/contextualcards/ContextualCard.java
View File

@@ -115,10 +115,6 @@ public class ContextualCard {
return mIsLargeCard; return mIsLargeCard;
} }
boolean isCustomCard() {
return TextUtils.isEmpty(mSliceUri);
}
public int getViewType() { public int getViewType() {
return mViewType; return mViewType;
} }

4
src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
View File

@@ -112,9 +112,7 @@ public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard>
if (cursor.getCount() > 0) { if (cursor.getCount() > 0) {
for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) { for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
final ContextualCard card = new ContextualCard(cursor); final ContextualCard card = new ContextualCard(cursor);
if (card.isCustomCard()) { if (isLargeCard(card)) {
//TODO(b/114688391): Load and generate custom card,then add into list
} else if (isLargeCard(card)) {
result.add(card.mutate().setIsLargeCard(true).build()); result.add(card.mutate().setIsLargeCard(true).build());
} else { } else {
result.add(card); result.add(card);

3
src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java
View File

@@ -88,9 +88,6 @@ public class EligibleCardChecker implements Callable<ContextualCard> {
if (card.getRankingScore() < 0) { if (card.getRankingScore() < 0) {
return false; return false;
} }
if (card.isCustomCard()) {
return true;
}
final Uri uri = card.getSliceUri(); final Uri uri = card.getSliceUri();
if (!ContentResolver.SCHEME_CONTENT.equals(uri.getScheme())) { if (!ContentResolver.SCHEME_CONTENT.equals(uri.getScheme())) {

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

@@ -75,18 +75,6 @@ public class EligibleCardCheckerTest {
assertThat(mEligibleCardChecker.mCard.hasInlineAction()).isTrue(); 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 @Test
public void isCardEligibleToDisplay_invalidScheme_returnFalse() { public void isCardEligibleToDisplay_invalidScheme_returnFalse() {
final Uri sliceUri = Uri.parse("contet://com.android.settings.slices/action/flashlight"); final Uri sliceUri = Uri.parse("contet://com.android.settings.slices/action/flashlight");