Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update unseen filter setting access to account for tri-state" into tm-qpr-dev am: de53d39982

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21049857

Change-Id: I27d65909a0299d85537c0b4477600b4cfd723309
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Steve Elliott
2023-01-20 23:35:41 +00:00
committed by Automerger Merge Worker
parent 95debf6eef de53d39982
commit d50083d232
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/provider/Settings.java
View File

@@ -9534,7 +9534,7 @@ public final class Settings {
/** /**
* Indicates whether "seen" notifications should be suppressed from the lockscreen. * Indicates whether "seen" notifications should be suppressed from the lockscreen.
* <p> * <p>
* Type: int (0 for false, 1 for true) * Type: int (0 for unset, 1 for true, 2 for false)
* *
* @hide * @hide
*/ */

4
packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinator.kt
View File

@@ -114,10 +114,10 @@ constructor(
.onStart { emit(Unit) } .onStart { emit(Unit) }
// for each change, lookup the new value // for each change, lookup the new value
.map { .map {
secureSettings.getBoolForUser( secureSettings.getIntForUser(
Settings.Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, Settings.Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS,
UserHandle.USER_CURRENT, UserHandle.USER_CURRENT,
) ) == 1
} }
// perform lookups on the bg thread pool // perform lookups on the bg thread pool
.flowOn(bgDispatcher) .flowOn(bgDispatcher)

10
packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorTest.kt
View File

@@ -321,7 +321,7 @@ class KeyguardCoordinatorTest : SysuiTestCase() {
val testDispatcher = UnconfinedTestDispatcher() val testDispatcher = UnconfinedTestDispatcher()
val testScope = TestScope(testDispatcher) val testScope = TestScope(testDispatcher)
val fakeSettings = FakeSettings().apply { 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 seenNotificationsProvider = SeenNotificationsProviderImpl()
val keyguardCoordinator = val keyguardCoordinator =
@@ -372,14 +372,14 @@ class KeyguardCoordinatorTest : SysuiTestCase() {
var showOnlyUnseenNotifsOnKeyguardSetting: Boolean var showOnlyUnseenNotifsOnKeyguardSetting: Boolean
get() = get() =
fakeSettings.getBoolForUser( fakeSettings.getIntForUser(
Settings.Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, Settings.Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS,
UserHandle.USER_CURRENT, UserHandle.USER_CURRENT,
) ) == 1
set(value) { set(value) {
fakeSettings.putBoolForUser( fakeSettings.putIntForUser(
Settings.Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS, Settings.Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS,
value, if (value) 1 else 2,
UserHandle.USER_CURRENT, UserHandle.USER_CURRENT,
) )
} }