diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationPresenter.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationPresenter.java index 1c9bc60deefe2..5dcf6d1d8f283 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationPresenter.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationPresenter.java @@ -42,6 +42,11 @@ public interface NotificationPresenter extends ExpandableNotificationRow.OnExpan */ void onUserSwitched(int newUserId); + /** + * Called when a new row is created and bound to a notification. + */ + void onBindRow(ExpandableNotificationRow row); + /** * @return true iff the device is in vr mode */ diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/NotificationRowBinderImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/NotificationRowBinderImpl.java index bdb206beb123a..38c37239a7d3a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/NotificationRowBinderImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/NotificationRowBinderImpl.java @@ -71,7 +71,6 @@ public class NotificationRowBinderImpl implements NotificationRowBinder { private NotificationPresenter mPresenter; private NotificationListContainer mListContainer; - private BindRowCallback mBindRowCallback; private NotificationClicker mNotificationClicker; private FeatureFlags mFeatureFlags; @@ -103,11 +102,9 @@ public class NotificationRowBinderImpl implements NotificationRowBinder { * Sets up late-bound dependencies for this component. */ public void setUpWithPresenter(NotificationPresenter presenter, - NotificationListContainer listContainer, - BindRowCallback bindRowCallback) { + NotificationListContainer listContainer) { mPresenter = presenter; mListContainer = listContainer; - mBindRowCallback = bindRowCallback; mIconManager.attach(); } @@ -179,7 +176,7 @@ public class NotificationRowBinderImpl implements NotificationRowBinder { mNotificationRemoteInputManager.bindRow(row); entry.setRow(row); mNotifBindPipeline.manageRow(entry, row); - mBindRowCallback.onBindRow(row); + mPresenter.onBindRow(row); row.setInlineReplyAnimationFlagEnabled( mFeatureFlags.isEnabled(NOTIFICATION_INLINE_REPLY_ANIMATION)); } @@ -235,12 +232,4 @@ public class NotificationRowBinderImpl implements NotificationRowBinder { } }); } - - /** Callback for when a row is bound to an entry. */ - public interface BindRowCallback { - /** - * Called when a new row is created and bound to a notification. - */ - void onBindRow(ExpandableNotificationRow row); - } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsController.kt index a5278c3d0ad3f..c9ebed18c6235 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsController.kt @@ -20,7 +20,6 @@ import android.service.notification.StatusBarNotification import com.android.systemui.plugins.statusbar.NotificationSwipeActionHelper.SnoozeOption import com.android.systemui.statusbar.NotificationPresenter import com.android.systemui.statusbar.notification.NotificationActivityStarter -import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinderImpl import com.android.systemui.statusbar.notification.collection.render.NotifStackController import com.android.systemui.statusbar.notification.stack.NotificationListContainer import com.android.systemui.statusbar.phone.CentralSurfaces @@ -38,7 +37,6 @@ interface NotificationsController { listContainer: NotificationListContainer, stackController: NotifStackController, notificationActivityStarter: NotificationActivityStarter, - bindRowCallback: NotificationRowBinderImpl.BindRowCallback ) fun resetUserExpandedStates() diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsControllerImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsControllerImpl.kt index 0ed41758f215d..6409635af2502 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsControllerImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsControllerImpl.kt @@ -83,7 +83,6 @@ class NotificationsControllerImpl @Inject constructor( listContainer: NotificationListContainer, stackController: NotifStackController, notificationActivityStarter: NotificationActivityStarter, - bindRowCallback: NotificationRowBinderImpl.BindRowCallback ) { notificationListener.registerAsSystemService() @@ -97,10 +96,7 @@ class NotificationsControllerImpl @Inject constructor( clickerBuilder.build( Optional.ofNullable(centralSurfaces), bubblesOptional, notificationActivityStarter)) - notificationRowBinder.setUpWithPresenter( - presenter, - listContainer, - bindRowCallback) + notificationRowBinder.setUpWithPresenter(presenter, listContainer) headsUpViewBinder.setPresenter(presenter) notifBindPipelineInitializer.initialize() animatedImageNotificationManager.bind() diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsControllerStub.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsControllerStub.kt index 14856dafdb11d..302a1f4222408 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsControllerStub.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/init/NotificationsControllerStub.kt @@ -21,7 +21,6 @@ import com.android.systemui.plugins.statusbar.NotificationSwipeActionHelper.Snoo import com.android.systemui.statusbar.NotificationListener import com.android.systemui.statusbar.NotificationPresenter import com.android.systemui.statusbar.notification.NotificationActivityStarter -import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinderImpl import com.android.systemui.statusbar.notification.collection.render.NotifStackController import com.android.systemui.statusbar.notification.stack.NotificationListContainer import com.android.systemui.statusbar.phone.CentralSurfaces @@ -40,7 +39,6 @@ class NotificationsControllerStub @Inject constructor( listContainer: NotificationListContainer, stackController: NotifStackController, notificationActivityStarter: NotificationActivityStarter, - bindRowCallback: NotificationRowBinderImpl.BindRowCallback ) { // Always connect the listener even if notification-handling is disabled. Being a listener // grants special permissions and it's not clear if other things will break if we lose those diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java index 2cf9a219716ce..cba9698d5efdb 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java @@ -1571,8 +1571,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { mPresenter, mNotifListContainer, mStackScrollerController.getNotifStackController(), - mNotificationActivityStarter, - mCentralSurfacesComponent.getBindRowCallback()); + mNotificationActivityStarter); } /** diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java index 5624e28204cc9..3b56d2769d7f7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java @@ -52,7 +52,6 @@ import com.android.systemui.statusbar.notification.AboveShelfObserver; import com.android.systemui.statusbar.notification.DynamicPrivacyController; import com.android.systemui.statusbar.notification.NotifPipelineFlags; import com.android.systemui.statusbar.notification.collection.NotificationEntry; -import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinderImpl; import com.android.systemui.statusbar.notification.collection.render.NotifShadeEventSource; import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProvider; import com.android.systemui.statusbar.notification.interruption.NotificationInterruptSuppressor; @@ -68,9 +67,7 @@ import com.android.systemui.statusbar.policy.KeyguardStateController; import javax.inject.Inject; @CentralSurfacesComponent.CentralSurfacesScope -class StatusBarNotificationPresenter implements NotificationPresenter, - NotificationRowBinderImpl.BindRowCallback, - CommandQueue.Callbacks { +class StatusBarNotificationPresenter implements NotificationPresenter, CommandQueue.Callbacks { private static final String TAG = "StatusBarNotificationPresenter"; private final ActivityStarter mActivityStarter; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenterModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenterModule.java index 26c483ce18fa2..d94e434c33396 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenterModule.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenterModule.java @@ -17,7 +17,6 @@ package com.android.systemui.statusbar.phone; import com.android.systemui.statusbar.NotificationPresenter; -import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinderImpl; import dagger.Binds; import dagger.Module; @@ -26,8 +25,4 @@ import dagger.Module; public abstract class StatusBarNotificationPresenterModule { @Binds abstract NotificationPresenter bindPresenter(StatusBarNotificationPresenter impl); - - @Binds - abstract NotificationRowBinderImpl.BindRowCallback bindBindRowCallback( - StatusBarNotificationPresenter impl); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/CentralSurfacesComponent.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/CentralSurfacesComponent.java index 158f96123d92c..62aa7eb4f341b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/CentralSurfacesComponent.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/CentralSurfacesComponent.java @@ -29,7 +29,6 @@ import com.android.systemui.shade.ShadeHeaderController; import com.android.systemui.statusbar.NotificationPresenter; import com.android.systemui.statusbar.NotificationShelfController; import com.android.systemui.statusbar.notification.NotificationActivityStarter; -import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinderImpl; import com.android.systemui.statusbar.notification.stack.NotificationListContainer; import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController; import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutListContainerModule; @@ -134,7 +133,5 @@ public interface CentralSurfacesComponent { NotificationPresenter getNotificationPresenter(); - NotificationRowBinderImpl.BindRowCallback getBindRowCallback(); - NotificationListContainer getNotificationListContainer(); }