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

Commit ae112c8a authored by Fan Zhang's avatar Fan Zhang Committed by android-build-merger
Browse files

Merge "Add emergency broadcast to app & notification settings." into oc-dev 

am: 908cad27

Change-Id: I743b5e63b42e65b8b405417d8e221077a452cc35
parents 586b1e4c 908cad27

res/xml/app_and_notification.xml

+14 −3
Original line number Diff line number Diff line
@@ -32,6 +32,17 @@ 
        android:key="dashboard_tile_placeholder"

        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"

src/com/android/settings/dashboard/ProgressiveDisclosureMixin.java

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

    }



    /**

tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java

+9 −0
Original line number Diff line number Diff line
@@ -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);