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

Fix conditional cards disappeared from contextual homepage

Browse Source 
This symptom only occurred in the case of more than 3 conditional cards
and no suggestion cards in homepage. It is caused by incompletely keeping
conditional cards. So adding missing card types makes conditional cards
be kept correctly.

Bug: 120115919
Test: robotest
Change-Id: Ic67c0a813de4f966c164bf92e4d4d64debcf95be
This commit is contained in:
Mill Chen
2018-11-28 16:35:25 +08:00
parent 926571dc29
commit e44d953a25
2 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/homepage/contextualcards/ContextualCardManager.java
View File

@@ -40,6 +40,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.TreeSet;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@@ -132,8 +133,13 @@ public class ContextualCardManager implements ContextualCardLoader.CardContentLo
// except Conditional cards, all other cards are from the database. So when the map sent // except Conditional cards, all other cards are from the database. So when the map sent
// here is empty, we only keep Conditional cards. // here is empty, we only keep Conditional cards.
if (cardTypes.isEmpty()) { if (cardTypes.isEmpty()) {
final Set<Integer> conditionalCardTypes = new TreeSet() {{
add(ContextualCard.CardType.CONDITIONAL);
add(ContextualCard.CardType.CONDITIONAL_HEADER);
add(ContextualCard.CardType.CONDITIONAL_FOOTER);
}};
cardsToKeep = mContextualCards.stream() cardsToKeep = mContextualCards.stream()
.filter(card -> card.getCardType() == ContextualCard.CardType.CONDITIONAL) .filter(card -> conditionalCardTypes.contains(card.getCardType()))
.collect(Collectors.toList()); .collect(Collectors.toList());
} else { } else {
cardsToKeep = mContextualCards.stream() cardsToKeep = mContextualCards.stream()

29
tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardManagerTest.java
View File

@@ -25,6 +25,8 @@ import android.content.Context;
import android.net.Uri; import android.net.Uri;
import android.util.ArrayMap; import android.util.ArrayMap;
import com.android.settings.homepage.contextualcards.conditional.ConditionFooterContextualCard;
import com.android.settings.homepage.contextualcards.conditional.ConditionHeaderContextualCard;
import com.android.settings.homepage.contextualcards.conditional.ConditionalContextualCard; import com.android.settings.homepage.contextualcards.conditional.ConditionalContextualCard;
import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -70,7 +72,7 @@ public class ContextualCardManagerTest {
} }
@Test @Test
public void onContextualCardUpdated_emtpyMapWithExistingCards_shouldOnlyKeepConditionalCard() { public void onContextualCardUpdated_emptyMapWithExistingCards_shouldOnlyKeepConditionalCard() {
mManager.mContextualCards.add(new ConditionalContextualCard.Builder().build()); mManager.mContextualCards.add(new ConditionalContextualCard.Builder().build());
mManager.mContextualCards.add( mManager.mContextualCards.add(
buildContextualCard(TEST_SLICE_URI)); buildContextualCard(TEST_SLICE_URI));
@@ -84,6 +86,31 @@ public class ContextualCardManagerTest {
.isEqualTo(ContextualCard.CardType.CONDITIONAL); .isEqualTo(ContextualCard.CardType.CONDITIONAL);
} }
@Test
public void onContextualCardUpdated_hasEmptyMap_shouldKeepConditionalHeaderCard() {
mManager.mContextualCards.add(new ConditionHeaderContextualCard.Builder().build());
mManager.setListener(mListener);
mManager.onContextualCardUpdated(new ArrayMap<>());
assertThat(mManager.mContextualCards).hasSize(1);
assertThat(mManager.mContextualCards.get(0).getCardType())
.isEqualTo(ContextualCard.CardType.CONDITIONAL_HEADER);
}
@Test
public void onContextualCardUpdated_hasEmptyMap_shouldKeepConditionalFooterCard() {
mManager.mContextualCards.add(new ConditionFooterContextualCard.Builder().build());
mManager.setListener(mListener);
mManager.onContextualCardUpdated(new ArrayMap<>());
assertThat(mManager.mContextualCards).hasSize(1);
assertThat(mManager.mContextualCards.get(0).getCardType())
.isEqualTo(ContextualCard.CardType.CONDITIONAL_FOOTER);
}
private ContextualCard buildContextualCard(String sliceUri) { private ContextualCard buildContextualCard(String sliceUri) {
return new ContextualCard.Builder() return new ContextualCard.Builder()
.setName("test_name") .setName("test_name")