Merge remote-tracking branch 'origin/lineage-19.1' into v1-s (e18c433e) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values-az/cm_strings.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -23,12 +23,12 @@
		<string name="clock">Saat</string>
		<string name="global_action_restart_more">Yenidən başlat\u2026</string>
		<string name="global_action_restart_system">Sistem</string>
		<string name="global_action_restart_recovery">Bərpa</string>
		<string name="global_action_restart_recovery">Geri qaytarma</string>
		<string name="global_action_restart_bootloader">Önyükləyici</string>
		<string name="global_action_restart_download">Endirmə</string>
		<string name="global_action_restart_fastboot">Fastbootd</string>
		<string name="global_action_restart_progress">Yenidən başladılır\u2026</string>
		<string name="global_action_restart_recovery_progress">Bərpa rejimində yenidən başladılır\u2026</string>
		<string name="global_action_restart_recovery_progress">Geri qaytarma rejimində yenidən başladılır\u2026</string>
		<string name="global_action_restart_bootloader_progress">Önyükləyici rejimində yenidən başladılır\u2026</string>
		<string name="global_action_restart_download_progress">Endirmə rejimində yenidən başladılır\u2026</string>
		<string name="global_action_restart_fastboot_progress">Fastbootd rejimində yenidən başladılır\u2026</string>

packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -581,7 +581,7 @@ class MediaDataManager(
		// Song name
		var song: CharSequence? = metadata?.getString(MediaMetadata.METADATA_KEY_DISPLAY_TITLE)
		if (song.isNullOrBlank()) {
		song = metadata.getString(MediaMetadata.METADATA_KEY_TITLE)
		song = metadata?.getString(MediaMetadata.METADATA_KEY_TITLE)
		}
		if (song.isNullOrBlank()) {
		song = HybridGroupManager.resolveTitle(notif)

packages/SystemUI/tests/src/com/android/systemui/media/MediaDataManagerTest.kt

+12 −9

Original line number	Diff line number	Diff line
		@@ -268,8 +268,6 @@ class MediaDataManagerTest : SysuiTestCase() {
		@Test
		fun testOnNotificationAdded_emptyTitle_hasPlaceholder() {
		// When the manager has a notification with an empty title
		val listener = mock(MediaDataManager.Listener::class.java)
		mediaDataManager.addListener(listener)
		whenever(controller.metadata)
		.thenReturn(
		metadataBuilder
		@@ -285,7 +283,10 @@ class MediaDataManagerTest : SysuiTestCase() {
		.onMediaDataLoaded(
		eq(KEY),
		eq(null),
		capture(mediaDataCaptor)
		capture(mediaDataCaptor),
		eq(true),
		eq(0),
		eq(false)
		)
		val placeholderTitle = context.getString(R.string.controls_media_empty_title, APP_NAME)
		assertThat(mediaDataCaptor.value.song).isEqualTo(placeholderTitle)
		@@ -294,8 +295,6 @@ class MediaDataManagerTest : SysuiTestCase() {
		@Test
		fun testOnNotificationAdded_blankTitle_hasPlaceholder() {
		// GIVEN that the manager has a notification with a blank title
		val listener = mock(MediaDataManager.Listener::class.java)
		mediaDataManager.addListener(listener)
		whenever(controller.metadata)
		.thenReturn(
		metadataBuilder
		@@ -311,7 +310,10 @@ class MediaDataManagerTest : SysuiTestCase() {
		.onMediaDataLoaded(
		eq(KEY),
		eq(null),
		capture(mediaDataCaptor)
		capture(mediaDataCaptor),
		eq(true),
		eq(0),
		eq(false)
		)
		val placeholderTitle = context.getString(R.string.controls_media_empty_title, APP_NAME)
		assertThat(mediaDataCaptor.value.song).isEqualTo(placeholderTitle)
		@@ -321,8 +323,6 @@ class MediaDataManagerTest : SysuiTestCase() {
		fun testOnNotificationAdded_emptyMetadata_usesNotificationTitle() {
		// When the app sets the metadata title fields to empty strings, but does include a
		// non-blank notification title
		val listener = mock(MediaDataManager.Listener::class.java)
		mediaDataManager.addListener(listener)
		whenever(controller.metadata)
		.thenReturn(
		metadataBuilder
		@@ -349,7 +349,10 @@ class MediaDataManagerTest : SysuiTestCase() {
		.onMediaDataLoaded(
		eq(KEY),
		eq(null),
		capture(mediaDataCaptor)
		capture(mediaDataCaptor),
		eq(true),
		eq(0),
		eq(false)
		)
		assertThat(mediaDataCaptor.value.song).isEqualTo(SESSION_TITLE)
		}