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

Commit e4dc6c97 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Only show the channel toast if users expressly ask for it 

Test: NotificationChannelWarningsPreferenceControllerTest.java
Bug: 231150048
Change-Id: I4797a2184561ae3dcd03e62bfb78a90686458c6b
parent 7ab7c1d6

src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java

+1 −6
Original line number Diff line number Diff line
@@ -38,10 +38,6 @@ public class NotificationChannelWarningsPreferenceController extends 
    final static int SETTING_VALUE_ON = 1;

    @VisibleForTesting

    final static int SETTING_VALUE_OFF = 0;

    @VisibleForTesting

    final static int DEBUGGING_ENABLED = 1;

    @VisibleForTesting

    final static int DEBUGGING_DISABLED = 0;



    public NotificationChannelWarningsPreferenceController(Context context) {

        super(context);
@@ -64,9 +60,8 @@ public class NotificationChannelWarningsPreferenceController extends 


    @Override

    public void updateState(Preference preference) {

        final int defaultWarningEnabled = isDebuggable() ? DEBUGGING_ENABLED : DEBUGGING_DISABLED;

        final int mode = Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, defaultWarningEnabled);

                Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, 0);

        ((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF);

    }

tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java

+1 −13
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ public class NotificationChannelWarningsPreferenceControllerTest { 
    }



    @Test

    public void updateState_settingUndefinedDebuggingEnabled_preferenceShouldBeChecked() {

    public void updateState_settingUndefinedDebuggingEnabled_preferenceShouldNotBeChecked() {

        mController = spy(mController);

        doReturn(true).when(mController).isDebuggable();

        Settings.Global.putString(mContext.getContentResolver(),
@@ -110,18 +110,6 @@ public class NotificationChannelWarningsPreferenceControllerTest { 


        mController.updateState(mPreference);



        verify(mPreference).setChecked(true);

    }



    @Test

    public void updateState_settingUndefinedDebuggingDisabled_preferenceShouldNotBeChecked() {

        mController = spy(mController);

        doReturn(false).when(mController).isDebuggable();

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

                Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, "NotAnInteger");



        mController.updateState(mPreference);



        verify(mPreference).setChecked(false);

    }