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

Merge "Improve visual - Collapse the conditionals in all cases"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-07 05:29:31 +00:00
committed by Android (Google) Code Review
parent d8b3fd3869 8a1bccbc30
commit 94563cd08b
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java
View File

@@ -40,7 +40,7 @@ import java.util.stream.Collectors;
*/ */
public class ConditionContextualCardController implements ContextualCardController, public class ConditionContextualCardController implements ContextualCardController,
ConditionListener, LifecycleObserver, OnStart, OnStop { ConditionListener, LifecycleObserver, OnStart, OnStop {
public static final int EXPANDING_THRESHOLD = 2; public static final int EXPANDING_THRESHOLD = 0;
private static final double UNSUPPORTED_RANKING = -99999.0; private static final double UNSUPPORTED_RANKING = -99999.0;
private static final String TAG = "ConditionCtxCardCtrl"; private static final String TAG = "ConditionCtxCardCtrl";

30
tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardControllerTest.java
View File

@@ -112,7 +112,8 @@ public class ConditionContextualCardControllerTest {
} }
@Test @Test
public void getConditionalCards_hasOneConditionCard_shouldGetOneFullWidthCard() { public void getConditionalCards_hasOneConditionCardAndExpanded_shouldGetOneFullWidthCard() {
mController.setIsExpanded(true);
final Map<Integer, List<ContextualCard>> conditionalCards = final Map<Integer, List<ContextualCard>> conditionalCards =
mController.buildConditionalCardsWithFooterOrHeader(generateConditionCards(1)); mController.buildConditionalCardsWithFooterOrHeader(generateConditionCards(1));
@@ -120,11 +121,24 @@ public class ConditionContextualCardControllerTest {
assertThat(conditionalCards.get(CardType.CONDITIONAL)).hasSize(1); assertThat(conditionalCards.get(CardType.CONDITIONAL)).hasSize(1);
assertThat(conditionalCards.get(CardType.CONDITIONAL).get(0).isHalfWidth()).isFalse(); assertThat(conditionalCards.get(CardType.CONDITIONAL).get(0).isHalfWidth()).isFalse();
assertThat(conditionalCards.get(CardType.CONDITIONAL_HEADER)).isEmpty(); assertThat(conditionalCards.get(CardType.CONDITIONAL_HEADER)).isEmpty();
assertThat(conditionalCards.get(CardType.CONDITIONAL_FOOTER)).isNotEmpty();
}
@Test
public void getConditionalCards_hasOneConditionCardAndCollapsed_shouldGetConditionalHeader() {
mController.setIsExpanded(false);
final Map<Integer, List<ContextualCard>> conditionalCards =
mController.buildConditionalCardsWithFooterOrHeader(generateConditionCards(1));
assertThat(conditionalCards).hasSize(3);
assertThat(conditionalCards.get(CardType.CONDITIONAL)).isEmpty();
assertThat(conditionalCards.get(CardType.CONDITIONAL_HEADER)).isNotEmpty();
assertThat(conditionalCards.get(CardType.CONDITIONAL_FOOTER)).isEmpty(); assertThat(conditionalCards.get(CardType.CONDITIONAL_FOOTER)).isEmpty();
} }
@Test @Test
public void getConditionalCards_hasTwoConditionCards_shouldGetTwoHalfWidthCards() { public void getConditionalCards_hasTwoConditionCardsAndExpanded_shouldGetTwoHalfWidthCards() {
mController.setIsExpanded(true);
final Map<Integer, List<ContextualCard>> conditionalCards = final Map<Integer, List<ContextualCard>> conditionalCards =
mController.buildConditionalCardsWithFooterOrHeader(generateConditionCards(2)); mController.buildConditionalCardsWithFooterOrHeader(generateConditionCards(2));
@@ -134,6 +148,18 @@ public class ConditionContextualCardControllerTest {
assertThat(card.isHalfWidth()).isTrue(); assertThat(card.isHalfWidth()).isTrue();
} }
assertThat(conditionalCards.get(CardType.CONDITIONAL_HEADER)).isEmpty(); assertThat(conditionalCards.get(CardType.CONDITIONAL_HEADER)).isEmpty();
assertThat(conditionalCards.get(CardType.CONDITIONAL_FOOTER)).isNotEmpty();
}
@Test
public void getConditionalCards_hasTwoConditionCardsAndCollapsed_shouldGetConditionalHeader() {
mController.setIsExpanded(false);
final Map<Integer, List<ContextualCard>> conditionalCards =
mController.buildConditionalCardsWithFooterOrHeader(generateConditionCards(2));
assertThat(conditionalCards).hasSize(3);
assertThat(conditionalCards.get(CardType.CONDITIONAL)).isEmpty();
assertThat(conditionalCards.get(CardType.CONDITIONAL_HEADER)).isNotEmpty();
assertThat(conditionalCards.get(CardType.CONDITIONAL_FOOTER)).isEmpty(); assertThat(conditionalCards.get(CardType.CONDITIONAL_FOOTER)).isEmpty();
} }