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

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

Merge "Update default for silent-notifs-in-statusbar"

parents 605d6b1d 2594b470

services/core/java/com/android/server/notification/PreferencesHelper.java

+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ public class PreferencesHelper implements RankingConfig { 
    private static final int DEFAULT_VISIBILITY = NotificationManager.VISIBILITY_NO_OVERRIDE;

    private static final int DEFAULT_IMPORTANCE = NotificationManager.IMPORTANCE_UNSPECIFIED;

    @VisibleForTesting

    static final boolean DEFAULT_HIDE_SILENT_STATUS_BAR_ICONS = false;

    static final boolean DEFAULT_HIDE_SILENT_STATUS_BAR_ICONS = true;

    private static final boolean DEFAULT_SHOW_BADGE = true;

    private static final boolean DEFAULT_ALLOW_BUBBLE = true;

    private static final boolean DEFAULT_OEM_LOCKED_IMPORTANCE  = false;
@@ -132,7 +132,7 @@ public class PreferencesHelper implements RankingConfig { 
    private SparseBooleanArray mBadgingEnabled;

    private SparseBooleanArray mBubblesEnabled;

    private boolean mAreChannelsBypassingDnd;

    private boolean mHideSilentStatusBarIcons;

    private boolean mHideSilentStatusBarIcons = DEFAULT_HIDE_SILENT_STATUS_BAR_ICONS;



    public PreferencesHelper(Context context, PackageManager pm, RankingHandler rankingHandler,

            ZenModeHelper zenHelper) {

services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java

+9 −2
Original line number Diff line number Diff line
@@ -2124,9 +2124,16 @@ public class PreferencesHelperTest extends UiServiceTestCase { 


    @Test

    public void testXml_statusBarIcons_default() throws Exception {

        ByteArrayOutputStream baos = writeXmlAndPurge(PKG_O, UID_O, false, UserHandle.USER_ALL);

        String preQXml = "<ranking version=\"1\">\n"

                + "<package name=\"" + PKG_N_MR1 + "\" show_badge=\"true\">\n"

                + "<channel id=\"something\" name=\"name\" importance=\"2\" "

                + "show_badge=\"true\" />\n"

                + "<channel id=\"miscellaneous\" name=\"Uncategorized\" usage=\"5\" "

                + "content_type=\"4\" flags=\"0\" show_badge=\"true\" />\n"

                + "</package>\n"

                + "</ranking>\n";

        mHelper = new PreferencesHelper(getContext(), mPm, mHandler, mMockZenModeHelper);

        loadStreamXml(baos, false, UserHandle.USER_ALL);

        loadByteArrayXml(preQXml.getBytes(), true, UserHandle.USER_SYSTEM);



        assertEquals(PreferencesHelper.DEFAULT_HIDE_SILENT_STATUS_BAR_ICONS,

                mHelper.shouldHideSilentStatusIcons());