commit d53c6d57f3b3efd8c5999083831a0474d7055b70
author Fan Zhang <zhfan@google.com> Fri Apr 28 13:51:08 2017 -0700
committer Fan Zhang <zhfan@google.com> Fri Apr 28 14:36:17 2017 -0700
tree de867600a523289e1367a8f1432f8c1cc46f38dc
parent 10158feecf828cd0218208d9fc351da969ad52f8

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

diff --git a/res/xml/app_and_notification.xml b/res/xml/app_and_notification.xml
index 627d3f8..639735d 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