Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee82a8c9 authored by Steve Elliott's avatar Steve Elliott Committed by Automerger Merge Worker
Browse files

Merge "Update unseen filter setting access to account for tri-state" into... 

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

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



Change-Id: I260f3559705c2d4b0b195f1bb83c2ec981de5c6b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 528d1ba2 d50083d2

core/java/android/provider/Settings.java

+1 −1
Original line number Diff line number Diff line
@@ -9738,7 +9738,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

         */

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

+2 −2
Original line number Diff line number Diff line
@@ -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)

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

+5 −5
Original line number Diff line number Diff line
@@ -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,

                )

            }