From d53c6d57f3b3efd8c5999083831a0474d7055b70 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Fri, 28 Apr 2017 13:51:08 -0700
Subject: [PATCH] Add emergency broadcast to app & notification settings.

Also fixed a bug where progressive disclosure expand button is displayed
incorrectly when # of preference == threshold exactly.

Change-Id: I518687e374853ae8ab1c7e5337822492d6fd99ff
Fix: 36557600
Test: robotests
---
 res/xml/app_and_notification.xml                | 17 ++++++++++++++---
 .../dashboard/ProgressiveDisclosureMixin.java   |  4 ++--
 .../dashboard/ProgressiveDisclosureTest.java    |  9 +++++++++
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/res/xml/app_and_notification.xml b/res/xml/app_and_notification.xml
index 627d3f80ee1..639735dcb59 100644
--- a/res/xml/app_and_notification.xml
+++ b/res/xml/app_and_notification.xml
@@ -25,17 +25,28 @@
         android:title="@string/app_permissions"
         android:order="-130"
         settings:keywords="@string/keywords_app_permissions">
-        <intent android:action="android.intent.action.MANAGE_PERMISSIONS"/>
+        <intent android:action="android.intent.action.MANAGE_PERMISSIONS" />
     </Preference>
 
     <PreferenceCategory
         android:key="dashboard_tile_placeholder"
-        android:order="10"/>
+        android:order="10" />
+
+    <com.android.settingslib.RestrictedPreference
+        android:key="app_and_notif_cell_broadcast_settings"
+        android:title="@string/cell_broadcast_settings"
+        android:order="15"
+        settings:useAdminDisabledSummary="true">
+        <intent
+            android:action="android.intent.action.MAIN"
+            android:targetPackage="com.android.cellbroadcastreceiver"
+            android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings" />
+    </com.android.settingslib.RestrictedPreference>
 
     <Preference
         android:key="special_access"
         android:fragment="com.android.settings.applications.SpecialAccessSettings"
         android:title="@string/special_access"
-        android:order="20"/>
+        android:order="20" />
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/src/com/android/settings/dashboard/ProgressiveDisclosureMixin.java b/src/com/android/settings/dashboard/ProgressiveDisclosureMixin.java
index 07a729377ac..b86fabfabba 100644
--- a/src/com/android/settings/dashboard/ProgressiveDisclosureMixin.java
+++ b/src/com/android/settings/dashboard/ProgressiveDisclosureMixin.java
@@ -120,7 +120,7 @@ public class ProgressiveDisclosureMixin implements Preference.OnPreferenceClickL
      * Whether the screen should be collapsed.
      */
     public boolean shouldCollapse(PreferenceScreen screen) {
-        return !mUserExpanded && screen.getPreferenceCount() >= mTileLimit;
+        return !mUserExpanded && screen.getPreferenceCount() > mTileLimit;
     }
 
     /**
@@ -218,7 +218,7 @@ public class ProgressiveDisclosureMixin implements Preference.OnPreferenceClickL
                 return pref;
             }
             if (pref instanceof PreferenceGroup) {
-                final Preference returnedPreference = ((PreferenceGroup)pref).findPreference(key);
+                final Preference returnedPreference = ((PreferenceGroup) pref).findPreference(key);
                 if (returnedPreference != null) {
                     return returnedPreference;
                 }
diff --git a/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java b/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java
index bae6f8f4a8a..d53e11be67c 100644
--- 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);