PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only show the channel toast if users expressly ask for it

Browse Source 
Test: NotificationChannelWarningsPreferenceControllerTest.java
Bug: 231150048
Change-Id: I4797a2184561ae3dcd03e62bfb78a90686458c6b
This commit is contained in:
Julia Reynolds
2022-07-25 10:58:04 -04:00
parent 7ab7c1d6f8
commit e4dc6c972f
2 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java
View File

@@ -38,10 +38,6 @@ public class NotificationChannelWarningsPreferenceController extends
final static int SETTING_VALUE_ON = 1; final static int SETTING_VALUE_ON = 1;
@VisibleForTesting @VisibleForTesting
final static int SETTING_VALUE_OFF = 0; 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) { public NotificationChannelWarningsPreferenceController(Context context) {
super(context); super(context);
@@ -64,9 +60,8 @@ public class NotificationChannelWarningsPreferenceController extends
@Override @Override
public void updateState(Preference preference) { public void updateState(Preference preference) {
final int defaultWarningEnabled = isDebuggable() ? DEBUGGING_ENABLED : DEBUGGING_DISABLED;
final int mode = Settings.Global.getInt(mContext.getContentResolver(), 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); ((SwitchPreference) mPreference).setChecked(mode != SETTING_VALUE_OFF);
} }

14
tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java
View File

@@ -102,7 +102,7 @@ public class NotificationChannelWarningsPreferenceControllerTest {
} }
@Test @Test
public void updateState_settingUndefinedDebuggingEnabled_preferenceShouldBeChecked() { public void updateState_settingUndefinedDebuggingEnabled_preferenceShouldNotBeChecked() {
mController = spy(mController); mController = spy(mController);
doReturn(true).when(mController).isDebuggable(); doReturn(true).when(mController).isDebuggable();
Settings.Global.putString(mContext.getContentResolver(), Settings.Global.putString(mContext.getContentResolver(),
@@ -110,18 +110,6 @@ public class NotificationChannelWarningsPreferenceControllerTest {
mController.updateState(mPreference); 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); verify(mPreference).setChecked(false);
} }