Merge "[Central Surfaces] Merge BindRowCallback with NotificationPresenter." into udc-qpr-dev (6a8822d9) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/NotificationPresenter.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -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
		*/

+2 −13

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -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()

+1 −5

Original line number	Diff line number	Diff line
		@@ -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()

+0 −2

Original line number	Diff line number	Diff line
		@@ -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