Merge "Add emergency broadcast to app & notification settings." into oc-dev

2017-04-29 06:53:11 +00:00
parent 9301381ac2 d53c6d57f3
commit 908cad27ab
3 changed files with 25 additions and 5 deletions
--- a/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java
@@ -92,6 +92,15 @@ public class ProgressiveDisclosureTest {
        assertThat(mMixin.shouldCollapse(mScreen)).isFalse();
    }

+    @Test
+    public void shouldNotCollapse_preferenceCountSameAsThreshold() {
+        when(mScreen.getPreferenceCount()).thenReturn(5);
+
+        mMixin.setTileLimit(5);
+
+        assertThat(mMixin.shouldCollapse(mScreen)).isFalse();
+    }
+
    @Test
    public void shouldNotCollapse_whenStartAsExpanded() {
        when(mScreen.getPreferenceCount()).thenReturn(5);