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

Commit bec6d10a authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "Only show the channel toast if users expressly ask for it" into... 

Merge "Only show the channel toast if users expressly ask for it" into tm-qpr-dev am: 45bcb214 am: 197091ca

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19416082



Change-Id: Icd88b407b2fbfd0f76f62e32586179fb4ee50559
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 03182b57 197091ca

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);

    }