diff options
3 files changed, 8 insertions, 8 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index a5092fb8f17c..b4a33fffeb48 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -9534,7 +9534,7 @@ public final class Settings { /** * Indicates whether "seen" notifications should be suppressed from the lockscreen. * <p> - * Type: int (0 for false, 1 for true) + * Type: int (0 for unset, 1 for true, 2 for false) * * @hide */ diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinator.kt index 76252d0fc5b9..e996b78133f6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinator.kt @@ -114,10 +114,10 @@ constructor( .onStart { emit(Unit) } // for each change, lookup the new value .map { - secureSettings.getBoolForUser( + secureSettings.getIntForUser( Settings.Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, UserHandle.USER_CURRENT, - ) + ) == 1 } // perform lookups on the bg thread pool .flowOn(bgDispatcher) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorTest.kt index be6b1dc8e4a4..2686238c0d3c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorTest.kt @@ -321,7 +321,7 @@ class KeyguardCoordinatorTest : SysuiTestCase() { val testDispatcher = UnconfinedTestDispatcher() val testScope = TestScope(testDispatcher) val fakeSettings = FakeSettings().apply { - putBool(Settings.Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, true) + putInt(Settings.Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, 1) } val seenNotificationsProvider = SeenNotificationsProviderImpl() val keyguardCoordinator = @@ -372,14 +372,14 @@ class KeyguardCoordinatorTest : SysuiTestCase() { var showOnlyUnseenNotifsOnKeyguardSetting: Boolean get() = - fakeSettings.getBoolForUser( + fakeSettings.getIntForUser( Settings.Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, UserHandle.USER_CURRENT, - ) + ) == 1 set(value) { - fakeSettings.putBoolForUser( + fakeSettings.putIntForUser( Settings.Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, - value, + if (value) 1 else 2, UserHandle.USER_CURRENT, ) } |