Merge "Use string resource for bundle title (1/2)" into main (8532954c) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/row/BundleHeader.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import androidx.compose.ui.Modifier
		import androidx.compose.ui.layout.ContentScale
		import androidx.compose.ui.layout.Layout
		import androidx.compose.ui.platform.ComposeView
		import androidx.compose.ui.res.stringResource
		import androidx.compose.ui.text.style.TextOverflow
		import androidx.compose.ui.unit.constrainHeight
		import androidx.compose.ui.unit.constrainWidth
		@@ -119,7 +120,7 @@ private fun ContentScope.BundleHeaderContent(
		) {
		BundleIcon(viewModel.bundleIcon, modifier = Modifier.padding(horizontal = 16.dp))
		Text(
		text = viewModel.titleText,
		text = stringResource(viewModel.titleTextResId),
		style = MaterialTheme.typography.titleMediumEmphasized,
		color = MaterialTheme.colorScheme.primary,
		overflow = TextOverflow.Ellipsis,

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/NotificationGroupingUtilTest.kt

+13 −6

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import com.android.systemui.statusbar.notification.collection.BundleEntry
		import com.android.systemui.statusbar.notification.collection.EntryAdapterFactory
		import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow
		import com.android.systemui.statusbar.notification.row.NotificationTestHelper
		import com.android.systemui.statusbar.notification.row.data.repository.TEST_BUNDLE_SPEC
		import com.android.systemui.statusbar.notification.row.entryAdapterFactory
		import com.android.systemui.statusbar.notification.shared.NotificationBundleUi
		import com.android.systemui.testKosmos
		@@ -78,15 +79,15 @@ class NotificationGroupingUtilTest(flags: FlagsParameterization) : SysuiTestCase

		underTest = NotificationGroupingUtil(row)

		assertThat(NotificationGroupingUtil.ICON_EXTRACTOR.extractData(row)).isInstanceOf(
		Notification::class.java)
		assertThat(NotificationGroupingUtil.ICON_EXTRACTOR.extractData(row))
		.isInstanceOf(Notification::class.java)
		}

		@Test
		@EnableFlags(NotificationBundleUi.FLAG_NAME)
		fun iconExtractor_noException_bundle() {
		val row = mock(ExpandableNotificationRow::class.java)
		val be = BundleEntry("promotions")
		val be = BundleEntry(TEST_BUNDLE_SPEC)
		`when`(row.entryAdapter).thenReturn(factory.create(be))

		underTest = NotificationGroupingUtil(row)
		@@ -114,8 +115,14 @@ class NotificationGroupingUtilTest(flags: FlagsParameterization) : SysuiTestCase
		@Test
		@EnableFlags(NotificationBundleUi.FLAG_NAME)
		fun iconComparator_bundleNotification() {
		assertThat(NotificationGroupingUtil.IconComparator().hasSameIcon(null,
		NotificationGroupingUtil.ICON_EXTRACTOR.extractData(testHelper.createRow()))).isFalse()
		assertThat(
		NotificationGroupingUtil.IconComparator()
		.hasSameIcon(
		null,
		NotificationGroupingUtil.ICON_EXTRACTOR.extractData(testHelper.createRow()),
		)
		)
		.isFalse()
		}

		@Test

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/BundleEntryAdapterTest.kt

+3 −2

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier.Companion.TYPE_NON_PERSON
		import com.android.systemui.statusbar.notification.row.data.repository.TEST_BUNDLE_SPEC
		import com.android.systemui.statusbar.notification.row.entryAdapterFactory
		import com.android.systemui.statusbar.notification.shared.NotificationBundleUi
		import com.android.systemui.testKosmos
		@@ -49,7 +50,7 @@ class BundleEntryAdapterTest : SysuiTestCase() {

		@Before
		fun setUp() {
		entry = BundleEntry("key")
		entry = BundleEntry(TEST_BUNDLE_SPEC)
		underTest = factory.create(entry) as BundleEntryAdapter
		}

		@@ -80,7 +81,7 @@ class BundleEntryAdapterTest : SysuiTestCase() {

		@Test
		fun getKey_adapter() {
		assertThat(underTest.key).isEqualTo("key")
		assertThat(underTest.key).isEqualTo(TEST_BUNDLE_SPEC.key)
		}

		@Test

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/coordinator/LockScreenMinimalismCoordinatorTest.kt

+3 −2

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@ import com.android.systemui.statusbar.notification.data.repository.FakeHeadsUpRo
		import com.android.systemui.statusbar.notification.data.repository.activeNotificationListRepository
		import com.android.systemui.statusbar.notification.domain.interactor.lockScreenNotificationMinimalismSetting
		import com.android.systemui.statusbar.notification.headsup.PinnedStatus
		import com.android.systemui.statusbar.notification.row.data.repository.TEST_BUNDLE_SPEC
		import com.android.systemui.statusbar.notification.shared.NotificationMinimalism
		import com.android.systemui.statusbar.notification.stack.data.repository.headsUpNotificationRepository
		import com.android.systemui.testKosmos
		@@ -311,7 +312,7 @@ class LockScreenMinimalismCoordinatorTest : SysuiTestCase() {
		val group = GroupEntryBuilder().setSummary(parent).addChild(child1).addChild(child2).build()
		val listEntryList = listOf(group, solo1, solo2)
		val notificationEntryList = listOf(solo1, solo2, parent, child1, child2)
		val bundle = BundleEntry("bundleKey")
		val bundle = BundleEntry(TEST_BUNDLE_SPEC)
		val bundleList = listOf(bundle)

		runCoordinatorTest {
		@@ -454,7 +455,7 @@ class LockScreenMinimalismCoordinatorTest : SysuiTestCase() {

		private fun KeyguardCoordinatorTestScope.setShadeAndQsExpansionThenWait(
		shadeExpansion: Float,
		qsExpansion: Float
		qsExpansion: Float,
		) {
		kosmos.shadeTestUtil.setShadeAndQsExpansion(shadeExpansion, qsExpansion)
		// The coordinator waits a fraction of a second for the shade expansion to stick.

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.statusbar.RankingBuilder;
		import com.android.systemui.statusbar.SbnBuilder;
		import com.android.systemui.statusbar.notification.collection.BundleEntry;
		import com.android.systemui.statusbar.notification.collection.BundleSpec;
		import com.android.systemui.statusbar.notification.collection.ListEntry;
		import com.android.systemui.statusbar.notification.collection.NotifPipeline;
		import com.android.systemui.statusbar.notification.collection.NotificationEntry;
		@@ -294,7 +295,7 @@ public class RankingCoordinatorTest extends SysuiTestCase {

		@Test
		public void testSilentSectioner_accepts_bundle() {
		BundleEntry bundleEntry = new BundleEntry("testBundleKey");
		BundleEntry bundleEntry = new BundleEntry(BundleSpec.Companion.getNEWS());
		assertTrue(mSilentSectioner.isInSection(bundleEntry));
		}

		@@ -307,7 +308,7 @@ public class RankingCoordinatorTest extends SysuiTestCase {

		@Test
		public void testMinimizedSectioner_rejectsBundle() {
		BundleEntry bundleEntry = new BundleEntry("testBundleKey");
		BundleEntry bundleEntry = new BundleEntry(BundleSpec.Companion.getNEWS());
		assertFalse(mMinimizedSectioner.isInSection(bundleEntry));
		}