Merge "Add emergency broadcast to app & notification settings." into oc-dev am: 908cad27ab

am: ae112c8a46 Change-Id: I879f97321c9a3af20a1c8ec2de49c8fcf4bedbe9
2017-04-29 06:59:44 +00:00
parent bf4b1b0261 ae112c8a46
commit 5801c66ad7
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);