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

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

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

Change-Id: Ie0c44628c38787a16cf055bf5a92c60071f7eaae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Julia Reynolds
2022-07-27 13:19:58 +00:00
committed by Automerger Merge Worker
parent 17070ee0c4 45bcb214da
commit 197091ca8a
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);
} }