Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d628a356 authored by Chris Göllner's avatar Chris Göllner Committed by Android (Google) Code Review
Browse files

Revert "Ensure notification status bar icons scale well on low-d..." 

Revert submission 34225834-sb-cd-ldpi-notif-icons

Reason for revert: b/428762953

Reverted changes: /q/submissionid:34225834-sb-cd-ldpi-notif-icons

Change-Id: Ia836d8ea42b13b802cf2e83ee4ca5e12a665a05d
parent f284f67f

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

+3 −13
Original line number Diff line number Diff line
@@ -145,7 +145,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
@@ -162,12 +162,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)
@@ -293,12 +288,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,