Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4667bc3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 1ad173bb 4f389a77

res/xml/app_and_notification.xml

+1 −2
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+0 −5
Original line number Diff line number Diff line
@@ -196,11 +196,6 @@ public class ManageApplicationsTest { 
                .isFalse();

    }



    @Test

    public void shouldUseStableItemHeight_notificationType_no() {



    }



    @Test

    public void onRebuildComplete_shouldHideLoadingView() {

        final Context context = RuntimeEnvironment.application;