Merge "Revert "Ensure notification status bar icons scale well on low-d..."" into main (b8d0ac29) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/IconManager.kt

+3 −13

Original line number	Diff line number	Diff line
		@@ -144,7 +144,7 @@ constructor(
		StatusBarConnectedDisplays.unsafeAssertInNewMode()

		val sbIcon = iconBuilder.createIconView(entry, context)
		sbIcon.scaleType = ImageView.ScaleType.FIT_CENTER
		sbIcon.scaleType = ImageView.ScaleType.CENTER_INSIDE
		val (normalIconDescriptor, _) = getIconDescriptors(entry)
		setIcon(entry, normalIconDescriptor, sbIcon)
		return sbIcon
		@@ -161,12 +161,7 @@ constructor(
		traceSection("IconManager.createIcons") {
		// Construct the status bar icon view.
		val sbIcon = iconBuilder.createIconView(entry)
		sbIcon.scaleType =
		if (StatusBarConnectedDisplays.isEnabled) {
		ImageView.ScaleType.FIT_CENTER
		} else {
		ImageView.ScaleType.CENTER_INSIDE
		}
		sbIcon.scaleType = ImageView.ScaleType.CENTER_INSIDE
		val sbChipIcon: StatusBarIconView?
		if (!StatusBarConnectedDisplays.isEnabled) {
		sbChipIcon = iconBuilder.createIconView(entry)
		@@ -286,12 +281,7 @@ constructor(
		traceSection("IconManager.createIcons") {
		// Construct the status bar icon view.
		val sbIcon = iconBuilder.createIconView(entry)
		sbIcon.scaleType =
		if (StatusBarConnectedDisplays.isEnabled) {
		ImageView.ScaleType.FIT_CENTER
		} else {
		ImageView.ScaleType.CENTER_INSIDE
		}
		sbIcon.scaleType = ImageView.ScaleType.CENTER_INSIDE
		val sbChipIcon: StatusBarIconView?
		if (!StatusBarConnectedDisplays.isEnabled) {
		sbChipIcon = iconBuilder.createIconView(entry)

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/icon/IconManagerTest.kt

+0 −47

Original line number	Diff line number	Diff line
		@@ -30,8 +30,6 @@ import android.os.SystemClock
		import android.os.UserHandle
		import android.platform.test.annotations.DisableFlags
		import android.platform.test.annotations.EnableFlags
		import android.widget.ImageView.ScaleType.CENTER_INSIDE
		import android.widget.ImageView.ScaleType.FIT_CENTER
		import androidx.test.InstrumentationRegistry
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		@@ -281,51 +279,6 @@ class IconManagerTest : SysuiTestCase() {
		assertThat(entry?.icons?.shelfIcon?.sourceIcon).isEqualTo(shortcutIc)
		}

		@Test
		@EnableFlags(StatusBarConnectedDisplays.FLAG_NAME)
		fun testCreateIcons_cdFlagEnabled_scaleTypeIsFitCenter() {
		val entry =
		notificationEntry(
		hasShortcut = false,
		hasMessageSenderIcon = false,
		hasLargeIcon = false,
		)

		iconManager.createIcons(entry!!)

		assertThat(entry.icons.statusBarIcon!!.scaleType).isEqualTo(FIT_CENTER)
		}

		@Test
		@DisableFlags(StatusBarConnectedDisplays.FLAG_NAME)
		fun testCreateIcons_cdFlagDisabled_scaleTypeIsCenterInside() {
		val entry =
		notificationEntry(
		hasShortcut = false,
		hasMessageSenderIcon = false,
		hasLargeIcon = false,
		)

		iconManager.createIcons(entry!!)

		assertThat(entry.icons.statusBarIcon!!.scaleType).isEqualTo(CENTER_INSIDE)
		}

		@Test
		@EnableFlags(StatusBarConnectedDisplays.FLAG_NAME)
		fun testCreateSbIconView_cdFlagEnabled_scaleTypeIsFitCenter() {
		val entry =
		notificationEntry(
		hasShortcut = false,
		hasMessageSenderIcon = false,
		hasLargeIcon = false,
		)

		val sbIconView = iconManager.createSbIconView(context, entry!!)

		assertThat(sbIconView.scaleType).isEqualTo(FIT_CENTER)
		}

		private fun notificationEntry(
		hasShortcut: Boolean,
		hasMessageSenderIcon: Boolean,