Merge "Tweak app notification page title and expand button cutoff"

res/xml/app_and_notification.xml

@@ -20,7 +20,7 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="apps_and_notification_screen"
     android:title="@string/app_and_notification_dashboard_title"
-    settings:initialExpandedChildrenCount="4">
+    settings:initialExpandedChildrenCount="6">
 
     <PreferenceCategory
         android:key="recent_apps_category"
@@ -37,7 +37,6 @@
                 android:action="android.intent.action.MAIN"
                 android:targetPackage="com.android.settings"
                 android:targetClass="com.android.settings.Settings$ManageApplicationsActivity">
-                <extra android:name="show_drawer_menu" android:value="true" />
             </intent>
         </Preference>
     </PreferenceCategory>

src/com/android/settings/applications/manageapplications/ManageApplications.java

@@ -232,7 +232,7 @@ public class ManageApplications extends InstrumentedPreferenceFragment
         Intent intent = activity.getIntent();
         Bundle args = getArguments();
         int screenTitle = intent.getIntExtra(
-                SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, R.string.notifications_label);
+                SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, R.string.application_info_label);
         String className = args != null ? args.getString(EXTRA_CLASSNAME) : null;
         if (className == null) {
             className = intent.getComponent().getClassName();

tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java

@@ -196,11 +196,6 @@ public class ManageApplicationsTest {
                 .isFalse();
     }
 
-    @Test
-    public void shouldUseStableItemHeight_notificationType_no() {
-
-    }
-
     @Test
     public void onRebuildComplete_shouldHideLoadingView() {
         final Context context = RuntimeEnvironment.application;