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

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

Merge "Don't show dnd upgrade dialog if user updated dnd"

parents 7d3e4c87 6c60b90d

packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java

+3 −1
Original line number Diff line number Diff line
@@ -145,7 +145,9 @@ public class DndTile extends QSTileImpl<BooleanState> { 
        int zenDuration = Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.ZEN_DURATION, 0);

        boolean showOnboarding = Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.SHOW_ZEN_UPGRADE_NOTIFICATION, 0) != 0;

                Settings.Secure.SHOW_ZEN_UPGRADE_NOTIFICATION, 0) != 0

                && Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.ZEN_SETTINGS_UPDATED, 0) != 1;

        if (showOnboarding) {

            // don't show on-boarding again or notification ever

            Settings.Secure.putInt(mContext.getContentResolver(),

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

+3 −1
Original line number Diff line number Diff line
@@ -1199,7 +1199,9 @@ public class ZenModeHelper { 
                && zen != Global.ZEN_MODE_OFF

                && !isWatch

                && Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Secure.SHOW_ZEN_UPGRADE_NOTIFICATION, 0) != 0;

                Settings.Secure.SHOW_ZEN_UPGRADE_NOTIFICATION, 0) != 0

                && Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Secure.ZEN_SETTINGS_UPDATED, 0) != 1;



        if (isWatch) {

            Settings.Global.putInt(mContext.getContentResolver(),

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

+21 −5
Original line number Diff line number Diff line
@@ -296,23 +296,39 @@ public class ZenModeHelperTest extends UiServiceTestCase { 


    @Test

    public void testZenUpgradeNotification() {

        // shows zen upgrade notification if stored settings says to shows, boot is completed

        // shows zen upgrade notification if stored settings says to shows,

        // zen has not been updated, boot is completed

        // and we're setting zen mode on

        Settings.Global.putInt(mContentResolver, Settings.Global.SHOW_ZEN_UPGRADE_NOTIFICATION, 1);

        Settings.Secure.putInt(mContentResolver, Settings.Secure.SHOW_ZEN_UPGRADE_NOTIFICATION, 1);

        Settings.Secure.putInt(mContentResolver, Settings.Secure.ZEN_SETTINGS_UPDATED, 0);

        mZenModeHelperSpy.mIsBootComplete = true;

        mZenModeHelperSpy.setZenModeSetting(Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS);



        verify(mZenModeHelperSpy, times(1)).createZenUpgradeNotification();

        verify(mNotificationManager, times(1)).notify(eq(ZenModeHelper.TAG),

                eq(SystemMessage.NOTE_ZEN_UPGRADE), any());

        assertEquals(0, Settings.Global.getInt(mContentResolver,

                Settings.Global.SHOW_ZEN_UPGRADE_NOTIFICATION, -1));

        assertEquals(0, Settings.Secure.getInt(mContentResolver,

                Settings.Secure.SHOW_ZEN_UPGRADE_NOTIFICATION, -1));

    }



    @Test

    public void testNoZenUpgradeNotification() {

        // doesn't show upgrade notification if stored settings says don't show

        Settings.Global.putInt(mContentResolver, Settings.Global.SHOW_ZEN_UPGRADE_NOTIFICATION, 0);

        Settings.Secure.putInt(mContentResolver, Settings.Secure.SHOW_ZEN_UPGRADE_NOTIFICATION, 0);

        Settings.Secure.putInt(mContentResolver, Settings.Secure.ZEN_SETTINGS_UPDATED, 0);

        mZenModeHelperSpy.mIsBootComplete = true;

        mZenModeHelperSpy.setZenModeSetting(Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS);



        verify(mZenModeHelperSpy, never()).createZenUpgradeNotification();

        verify(mNotificationManager, never()).notify(eq(ZenModeHelper.TAG),

                eq(SystemMessage.NOTE_ZEN_UPGRADE), any());

    }



    @Test

    public void testNoZenUpgradeNotificationZenUpdated() {

        // doesn't show upgrade notification since zen was already updated

        Settings.Secure.putInt(mContentResolver, Settings.Secure.SHOW_ZEN_UPGRADE_NOTIFICATION, 0);

        Settings.Secure.putInt(mContentResolver, Settings.Secure.ZEN_SETTINGS_UPDATED, 1);

        mZenModeHelperSpy.mIsBootComplete = true;

        mZenModeHelperSpy.setZenModeSetting(Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS);