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

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

Inline notif pipeline flag into ConvoNotifMgr am: 217202c8 am: 786a6470 

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



Change-Id: I384e829e6b42294513eba66ac35562aeae8daeec
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e93fbbf3 786a6470

packages/SystemUI/src/com/android/systemui/statusbar/notification/ConversationNotifications.kt

+2 −7
Original line number Original line Diff line number Diff line
@@ -31,7 +31,6 @@ import com.android.systemui.dagger.qualifiers.Main 
import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.statusbar.notification.collection.NotificationEntry

import com.android.systemui.statusbar.notification.collection.NotificationEntry

import com.android.systemui.statusbar.notification.collection.inflation.BindEventManager

import com.android.systemui.statusbar.notification.collection.inflation.BindEventManager

import com.android.systemui.statusbar.notification.collection.legacy.NotificationGroupManagerLegacy

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

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

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

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

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow
@@ -129,11 +128,9 @@ class AnimatedImageNotificationManager @Inject constructor( 
 */

 */

@SysUISingleton

@SysUISingleton

class ConversationNotificationManager @Inject constructor(

class ConversationNotificationManager @Inject constructor(

    private val bindEventManager: BindEventManager,

    bindEventManager: BindEventManager,

    private val notificationGroupManager: NotificationGroupManagerLegacy,

    private val context: Context,

    private val context: Context,

    private val notifCollection: CommonNotifCollection,

    private val notifCollection: CommonNotifCollection,

    private val featureFlags: NotifPipelineFlags,

    @Main private val mainHandler: Handler

    @Main private val mainHandler: Handler

) {

) {

    // Need this state to be thread safe, since it's accessed from the ui thread

    // Need this state to be thread safe, since it's accessed from the ui thread
@@ -172,12 +169,10 @@ class ConversationNotificationManager @Inject constructor( 
                                layout.setIsImportantConversation(important, false)

                                layout.setIsImportantConversation(important, false)

                            }

                            }

                        }

                        }

                if (changed && !featureFlags.isNewPipelineEnabled()) {

                    notificationGroupManager.updateIsolation(entry)

                }

            }

            }

        }

        }

    }

    }



    fun onEntryViewBound(entry: NotificationEntry) {

    fun onEntryViewBound(entry: NotificationEntry) {

        if (!entry.ranking.isConversation) {

        if (!entry.ranking.isConversation) {

            return

            return