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

Commit 651a6220 authored by Yining Liu's avatar Yining Liu
Browse files

Enable Show Only Unseen Notifs when Minimalism is enabled 

Enable the lock_screen_show_only_unseen_notifications feature
when the notification_minimalism flag is enabled. This change
makes it possible to turn on both features at the same time.

Bug: 330387368
Bug: 354047572
Flag: com.android.server.notification.notification_minimalism
Test: atest SystemUITests

Change-Id: I6ccdf93345fccb5530cbc9be807b6a67e26290b2
parent 2d1f3233

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

+1 −2
Original line number Diff line number Diff line
@@ -90,9 +90,8 @@ constructor( 
        mCoordinators.add(keyguardCoordinator)

        if (NotificationMinimalism.isEnabled) {

            mCoordinators.add(lockScreenMinimalismCoordinator)

        } else {

            mCoordinators.add(unseenKeyguardCoordinator)

        }

        mCoordinators.add(unseenKeyguardCoordinator)

        mCoordinators.add(rankingCoordinator)

        mCoordinators.add(colorizedFgsCoordinator)

        mCoordinators.add(deviceProvisionedCoordinator)

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

+0 −7
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import com.android.systemui.statusbar.notification.collection.coordinator.dagger 
import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifFilter

import com.android.systemui.statusbar.notification.collection.notifcollection.NotifCollectionListener

import com.android.systemui.statusbar.notification.domain.interactor.SeenNotificationsInteractor

import com.android.systemui.statusbar.notification.shared.NotificationMinimalism

import com.android.systemui.statusbar.policy.HeadsUpManager

import com.android.systemui.statusbar.policy.headsUpEvents

import com.android.systemui.util.asIndenting
@@ -51,7 +50,6 @@ import kotlinx.coroutines.flow.Flow 
import kotlinx.coroutines.flow.MutableSharedFlow

import kotlinx.coroutines.flow.collectLatest

import kotlinx.coroutines.flow.distinctUntilChanged

import kotlinx.coroutines.flow.flowOf

import kotlinx.coroutines.flow.map

import kotlinx.coroutines.flow.onEach

import kotlinx.coroutines.launch
@@ -87,7 +85,6 @@ constructor( 
    private var unseenFilterEnabled = false



    override fun attach(pipeline: NotifPipeline) {

        NotificationMinimalism.assertInLegacyMode()

        pipeline.addFinalizeFilter(unseenNotifFilter)

        pipeline.addCollectionListener(collectionListener)

        scope.launch { trackUnseenFilterSettingChanges() }
@@ -253,10 +250,6 @@ constructor( 
    }



    private fun unseenFeatureEnabled(): Flow<Boolean> {

        if (NotificationMinimalism.isEnabled) {

            // TODO(b/330387368): should this really just be turned off? If so, hide the setting.

            return flowOf(false)

        }

        return seenNotificationsInteractor.isLockScreenShowOnlyUnseenNotificationsEnabled()

    }