Merge "Merge 3 aconfig sub-flags into ui_rich_ongoing" into main (947d7a2e) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+0 −21

Original line number	Diff line number	Diff line
		@@ -511,13 +511,6 @@ flag {
		}
		}

		flag {
		name: "status_bar_notification_chips"
		namespace: "systemui"
		description: "Show promoted ongoing notifications as chips in the status bar"
		bug: "364653005"
		}

		flag {
		name: "status_bar_popup_chips"
		namespace: "systemui"
		@@ -2037,13 +2030,6 @@ flag {
		}
		}

		flag {
		name: "ui_rich_ongoing_force_expanded"
		namespace: "systemui"
		description: "Force promoted notifications to always be expanded"
		bug: "380901479"
		}

		flag {
		name: "permission_helper_ui_rich_ongoing"
		namespace: "systemui"
		@@ -2058,13 +2044,6 @@ flag {
		bug: "379186372"
		}

		flag {
		name: "aod_ui_rich_ongoing"
		namespace: "systemui"
		description: "Show a rich ongoing notification on the always-on display (depends on ui_rich_ongoing)"
		bug: "369151941"
		}

		flag {
		name: "stabilize_heads_up_group_v2"
		namespace: "systemui"

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

+0 −18

Original line number	Diff line number	Diff line
		@@ -308,24 +308,6 @@ public class NotificationEntryTest extends SysuiTestCase {
		assertFalse(mEntry.isPromotedOngoing());
		}

		@Test
		@EnableFlags(PromotedNotificationUi.FLAG_NAME)
		@DisableFlags(StatusBarNotifChips.FLAG_NAME)
		public void isPromotedOngoing_uiFlagOnAndNotifHasFlag_true() {
		mEntry.getSbn().getNotification().flags \|= FLAG_PROMOTED_ONGOING;

		assertTrue(mEntry.isPromotedOngoing());
		}

		@Test
		@EnableFlags(StatusBarNotifChips.FLAG_NAME)
		@DisableFlags(PromotedNotificationUi.FLAG_NAME)
		public void isPromotedOngoing_statusBarNotifChipsFlagOnAndNotifHasFlag_true() {
		mEntry.getSbn().getNotification().flags \|= FLAG_PROMOTED_ONGOING;

		assertTrue(mEntry.isPromotedOngoing());
		}

		@Test
		public void testIsNotificationVisibilityPrivate_true() {
		assertTrue(mEntry.isNotificationVisibilityPrivate());

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerImplTest.kt

+0 −14

Original line number	Diff line number	Diff line
		@@ -749,20 +749,6 @@ class HeadsUpManagerImplTest(flags: FlagsParameterization) : SysuiTestCase() {
		assertThat(getIsSticky_promotedAndExpanded()).isFalse()
		}

		@Test
		@EnableFlags(PromotedNotificationUi.FLAG_NAME)
		@DisableFlags(StatusBarNotifChips.FLAG_NAME)
		fun testIsSticky_promotedAndExpanded_promotedUiFlagOn_false() {
		assertThat(getIsSticky_promotedAndExpanded()).isFalse()
		}

		@Test
		@EnableFlags(StatusBarNotifChips.FLAG_NAME)
		@DisableFlags(PromotedNotificationUi.FLAG_NAME)
		fun testIsSticky_promotedAndExpanded_notifChipsFlagOn_false() {
		assertThat(getIsSticky_promotedAndExpanded()).isFalse()
		}

		private fun getIsSticky_promotedAndExpanded(): Boolean {
		val notif = Notification.Builder(mContext, "").setSmallIcon(R.drawable.ic_person).build()
		notif.flags = FLAG_PROMOTED_ONGOING

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/promoted/PromotedNotificationContentExtractorImplTest.kt

+0 −20

Original line number	Diff line number	Diff line
		@@ -75,26 +75,6 @@ class PromotedNotificationContentExtractorImplTest : SysuiTestCase() {
		assertThat(content).isNull()
		}

		@Test
		@EnableFlags(PromotedNotificationUi.FLAG_NAME)
		@DisableFlags(StatusBarNotifChips.FLAG_NAME)
		fun shouldExtract_promotedNotificationUiFlagEnabled() =
		kosmos.runTest {
		val entry = createEntry()
		val content = extractContent(entry)
		assertThat(content).isNotNull()
		}

		@Test
		@EnableFlags(StatusBarNotifChips.FLAG_NAME)
		@DisableFlags(PromotedNotificationUi.FLAG_NAME)
		fun shouldExtract_statusBarNotifChipsFlagEnabled() =
		kosmos.runTest {
		val entry = createEntry()
		val content = extractContent(entry)
		assertThat(content).isNotNull()
		}

		@Test
		@EnableFlags(PromotedNotificationUi.FLAG_NAME, StatusBarNotifChips.FLAG_NAME)
		fun shouldExtract_bothFlagsEnabled() =

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

+0 −29

Original line number	Diff line number	Diff line
		@@ -398,35 +398,6 @@ public class NotificationContentInflaterTest extends SysuiTestCase {
		mPromotedNotificationContentExtractor.verifyZeroExtractCalls();
		}

		@Test
		@EnableFlags(PromotedNotificationUi.FLAG_NAME)
		@DisableFlags(StatusBarNotifChips.FLAG_NAME)
		public void testExtractsPromotedContent_whePromotedNotificationUiFlagEnabled()
		throws Exception {
		final PromotedNotificationContentModels content =
		new PromotedNotificationContentBuilder("key").build();
		mPromotedNotificationContentExtractor.resetForEntry(mRow.getEntry(), content);

		inflateAndWait(mNotificationInflater, FLAG_CONTENT_VIEW_ALL, mRow);

		mPromotedNotificationContentExtractor.verifyOneExtractCall();
		assertEquals(content, mRow.getEntry().getPromotedNotificationContentModels());
		}

		@Test
		@EnableFlags(StatusBarNotifChips.FLAG_NAME)
		@DisableFlags(PromotedNotificationUi.FLAG_NAME)
		public void testExtractsPromotedContent_whenStatusBarNotifChipsFlagEnabled() throws Exception {
		final PromotedNotificationContentModels content =
		new PromotedNotificationContentBuilder("key").build();
		mPromotedNotificationContentExtractor.resetForEntry(mRow.getEntry(), content);

		inflateAndWait(mNotificationInflater, FLAG_CONTENT_VIEW_ALL, mRow);

		mPromotedNotificationContentExtractor.verifyOneExtractCall();
		assertEquals(content, mRow.getEntry().getPromotedNotificationContentModels());
		}

		@Test
		@EnableFlags({PromotedNotificationUi.FLAG_NAME, StatusBarNotifChips.FLAG_NAME})
		public void testExtractsPromotedContent_whenBothFlagsEnabled() throws Exception {