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

Inline notif pipeline flag into ConvoNotifMgr

Browse Source 
This change is a no-op; the flag is now enabled-by-default, so all
removed code paths here are effectively dead.

Bug: 200269355
Test: atest SystemUITests
Change-Id: I16163b42084825ff97c1f10cc93825e14a50b295
This commit is contained in:
Steve Elliott
2022-06-28 16:55:52 -04:00
parent 6aa41ab41b
commit 217202c8f7
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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