Merge "Remove flag: com.android.systemui.notification_row_content_binder_refactor" into main (f363a0f7) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+0 −7

Original line number	Diff line number	Diff line
		@@ -59,13 +59,6 @@ flag {
		bug: "375010573"
		}

		flag {
		name: "notification_row_content_binder_refactor"
		namespace: "systemui"
		description: "Convert the NotificationContentInflater to Kotlin and restructure it to support modern views"
		bug: "343942780"
		}

		flag {
		name: "notification_row_is_removed_fix"
		namespace: "systemui"

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationContentInflaterTest.java

deleted100644 → 0

+0 −568

File deleted.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImplTest.kt

+1 −2

Original line number	Diff line number	Diff line
		@@ -62,7 +62,6 @@ import com.android.systemui.statusbar.notification.row.shared.HeadsUpStatusBarMo
		import com.android.systemui.statusbar.notification.row.shared.LockscreenOtpRedaction
		import com.android.systemui.statusbar.notification.row.shared.NewRemoteViews
		import com.android.systemui.statusbar.notification.row.shared.NotificationContentModel
		import com.android.systemui.statusbar.notification.row.shared.NotificationRowContentBinderRefactor
		import com.android.systemui.statusbar.policy.InflatedSmartReplyState
		import com.android.systemui.statusbar.policy.InflatedSmartReplyViewHolder
		import com.android.systemui.statusbar.policy.SmartReplyStateInflater
		@@ -88,7 +87,7 @@ import platform.test.runner.parameterized.Parameters
		@SmallTest
		@RunWith(ParameterizedAndroidJunit4::class)
		@RunWithLooper
		@EnableFlags(NotificationRowContentBinderRefactor.FLAG_NAME, LockscreenOtpRedaction.FLAG_NAME)
		@EnableFlags(LockscreenOtpRedaction.FLAG_NAME)
		class NotificationRowContentBinderImplTest(flags: FlagsParameterization) : SysuiTestCase() {

		init {

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java

+2 −22

Original line number	Diff line number	Diff line
		@@ -76,7 +76,6 @@ import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow
		import com.android.systemui.statusbar.notification.row.NotificationGuts;
		import com.android.systemui.statusbar.notification.row.shared.HeadsUpStatusBarModel;
		import com.android.systemui.statusbar.notification.row.shared.NotificationContentModel;
		import com.android.systemui.statusbar.notification.row.shared.NotificationRowContentBinderRefactor;
		import com.android.systemui.statusbar.notification.shared.NotificationBundleUi;

		import kotlinx.coroutines.flow.MutableStateFlow;
		@@ -196,8 +195,8 @@ public final class NotificationEntry extends ListEntry {
		*/
		private boolean mIsDemoted = false;

		// TODO(b/377565433): Move into NotificationContentModel during/after
		// NotificationRowContentBinderRefactor.
		// TODO(b/377565433): maybe store this in NotificationContentModel now that
		// NotificationRowContentBinderRefactor has been inlined.
		private PromotedNotificationContentModels mPromotedNotificationContentModels;

		/**
		@@ -1000,30 +999,12 @@ public final class NotificationEntry extends ListEntry {
		return mHeadsUpStatusBarText;
		}

		/**
		* Sets the text to be displayed on the StatusBar, when this notification is the top pinned
		* heads up.
		*/
		public void setHeadsUpStatusBarText(CharSequence headsUpStatusBarText) {
		NotificationRowContentBinderRefactor.assertInLegacyMode();
		this.mHeadsUpStatusBarText.setValue(headsUpStatusBarText);
		}

		/** @see #setHeadsUpStatusBarTextPublic(CharSequence) */
		@NonNull
		public StateFlow<CharSequence> getHeadsUpStatusBarTextPublic() {
		return mHeadsUpStatusBarTextPublic;
		}

		/**
		* Sets the text to be displayed on the StatusBar, when this notification is the top pinned
		* heads up, and its content is sensitive right now.
		*/
		public void setHeadsUpStatusBarTextPublic(CharSequence headsUpStatusBarTextPublic) {
		NotificationRowContentBinderRefactor.assertInLegacyMode();
		this.mHeadsUpStatusBarTextPublic.setValue(headsUpStatusBarTextPublic);
		}

		public boolean isPulseSuppressed() {
		return mPulseSupressed;
		}
		@@ -1095,7 +1076,6 @@ public final class NotificationEntry extends ListEntry {

		/** Set the content generated by the notification inflater. */
		public void setContentModel(NotificationContentModel contentModel) {
		if (NotificationRowContentBinderRefactor.isUnexpectedlyInLegacyMode()) return;
		HeadsUpStatusBarModel headsUpStatusBarModel = contentModel.getHeadsUpStatusBarModel();
		this.mHeadsUpStatusBarText.setValue(headsUpStatusBarModel.getPrivateText());
		this.mHeadsUpStatusBarTextPublic.setValue(headsUpStatusBarModel.getPublicText());

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java

deleted100644 → 0

+0 −1584

File deleted.

Preview size limit exceeded, changes collapsed.