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

Merge "Default to hiding silent notifications on lockscreen in Settings" into tm-qpr-dev am: 5d780a42eb

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

Change-Id: I6b4ac70d7ca1d7c4fd76b42c6d26f7361ff3420d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Julia Tuttle
2022-10-17 16:07:43 +00:00
committed by Automerger Merge Worker
parent 90a1263b87 5d780a42eb
commit 8416222c25
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/notification/ShowOnLockScreenNotificationPreferenceController.java
View File

@@ -157,6 +157,6 @@ public class ShowOnLockScreenNotificationPreferenceController extends AbstractPr
private boolean getLockscreenSilentNotificationsEnabled() { private boolean getLockscreenSilentNotificationsEnabled() {
return Settings.Secure.getInt(mContext.getContentResolver(), return Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 1) != 0; Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 0) != 0;
} }
} }

14
tests/robotests/src/com/android/settings/notification/ShowOnLockscreenNotificationPreferenceControllerTest.java
View File

@@ -93,7 +93,7 @@ public class ShowOnLockscreenNotificationPreferenceControllerTest {
assertThat(mPreference.getValue()).isEqualTo( assertThat(mPreference.getValue()).isEqualTo(
String.valueOf(R.string.lock_screen_notifs_show_none)); String.valueOf(R.string.lock_screen_notifs_show_none));
assertThat(mPreference.getSummary()) assertThat(mPreference.getSummary().toString())
.isEqualTo(mContext.getString(R.string.lock_screen_notifs_show_none)); .isEqualTo(mContext.getString(R.string.lock_screen_notifs_show_none));
} }
@@ -110,7 +110,7 @@ public class ShowOnLockscreenNotificationPreferenceControllerTest {
assertThat(mPreference.getValue()).isEqualTo( assertThat(mPreference.getValue()).isEqualTo(
String.valueOf(R.string.lock_screen_notifs_show_alerting)); String.valueOf(R.string.lock_screen_notifs_show_alerting));
assertThat(mPreference.getSummary()) assertThat(mPreference.getSummary().toString())
.isEqualTo(mContext.getString(R.string.lock_screen_notifs_show_alerting)); .isEqualTo(mContext.getString(R.string.lock_screen_notifs_show_alerting));
} }
@@ -127,20 +127,20 @@ public class ShowOnLockscreenNotificationPreferenceControllerTest {
assertThat(mPreference.getValue()).isEqualTo( assertThat(mPreference.getValue()).isEqualTo(
String.valueOf(R.string.lock_screen_notifs_show_all)); String.valueOf(R.string.lock_screen_notifs_show_all));
assertThat(mPreference.getSummary()) assertThat(mPreference.getSummary().toString())
.isEqualTo(mContext.getString(R.string.lock_screen_notifs_show_all)); .isEqualTo(mContext.getString(R.string.lock_screen_notifs_show_all));
} }
@Test @Test
public void updateState_allNotifsOnLockscreen_isDefault() { public void updateState_alertingNotifsOnLockscreen_isDefault() {
// settings don't exist // settings don't exist
mController.displayPreference(mScreen); mController.displayPreference(mScreen);
assertThat(mPreference.getValue()).isEqualTo( assertThat(mPreference.getValue()).isEqualTo(
String.valueOf(R.string.lock_screen_notifs_show_all)); String.valueOf(R.string.lock_screen_notifs_show_alerting));
assertThat(mPreference.getSummary()) assertThat(mPreference.getSummary().toString())
.isEqualTo(mContext.getString(R.string.lock_screen_notifs_show_all)); .isEqualTo(mContext.getString(R.string.lock_screen_notifs_show_alerting));
} }
@Test @Test