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

Commit 142db9ac authored by Michael Mikhail's avatar Michael Mikhail Committed by Automerger Merge Worker
Browse files

Merge "[Media TTT] Add more info in talkback of receiver icon" into tm-qpr-dev am: 7da0e1d9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21179930



Change-Id: I451e757e1450ac1e52abceb141148b1117819c13
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 91dba75a 7da0e1d9

packages/SystemUI/res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -2382,6 +2382,10 @@ 
    <string name="media_transfer_loading">Loading</string>

    <!-- Default name of the device. [CHAR LIMIT=30] -->

    <string name="media_ttt_default_device_type">tablet</string>

    <!-- Description of media transfer icon of unknown app appears in receiver devices. [CHAR LIMIT=NONE]-->

    <string name="media_transfer_receiver_content_description_unknown_app">Casting your media</string>

    <!-- Description of media transfer icon appears in receiver devices. [CHAR LIMIT=NONE]-->

    <string name="media_transfer_receiver_content_description_with_app_name">Casting <xliff:g id="app_label" example="Spotify">%1$s</xliff:g></string>



    <!-- Error message indicating that a control timed out while waiting for an update [CHAR_LIMIT=30] -->

    <string name="controls_error_timeout">Inactive, check app</string>

packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/MediaTttUtils.kt

+29 −9
Original line number Diff line number Diff line
@@ -44,25 +44,37 @@ class MediaTttUtils { 
         * @param appPackageName the package name of the app playing the media.

         * @param onPackageNotFoundException a function run if a

         * [PackageManager.NameNotFoundException] occurs.

         * @param isReceiver indicates whether the icon is displayed in a receiver view.

         */

        fun getIconInfoFromPackageName(

            context: Context,

            appPackageName: String?,

            isReceiver: Boolean,

            onPackageNotFoundException: () -> Unit,

        ): IconInfo {

            if (appPackageName != null) {

                val packageManager = context.packageManager

                try {

                    val contentDescription =

                        ContentDescription.Loaded(

                    val appName =

                        packageManager

                            .getApplicationInfo(

                                appPackageName,

                                    PackageManager.ApplicationInfoFlags.of(0)

                                PackageManager.ApplicationInfoFlags.of(0),

                            )

                            .loadLabel(packageManager)

                            .toString()

                    val contentDescription =

                        if (isReceiver) {

                            ContentDescription.Loaded(

                                context.getString(

                                    R.string

                                        .media_transfer_receiver_content_description_with_app_name,

                                    appName

                                )

                            )

                        } else {

                            ContentDescription.Loaded(appName)

                        }

                    return IconInfo(

                        contentDescription,

                        MediaTttIcon.Loaded(packageManager.getApplicationIcon(appPackageName)),
@@ -74,7 +86,15 @@ class MediaTttUtils { 
                }

            }

            return IconInfo(

                ContentDescription.Resource(R.string.media_output_dialog_unknown_launch_app_name),

                if (isReceiver) {

                    ContentDescription.Resource(

                        R.string.media_transfer_receiver_content_description_unknown_app

                    )

                } else {

                    ContentDescription.Resource(

                        R.string.media_output_dialog_unknown_launch_app_name

                    )

                },

                MediaTttIcon.Resource(R.drawable.ic_cast),

                tintAttr = android.R.attr.textColorPrimary,

                isAppIcon = false

packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiver.kt

+5 −1
Original line number Diff line number Diff line
@@ -173,7 +173,11 @@ open class MediaTttChipControllerReceiver @Inject constructor( 


    override fun updateView(newInfo: ChipReceiverInfo, currentView: ViewGroup) {

        val packageName = newInfo.routeInfo.clientPackageName

        var iconInfo = MediaTttUtils.getIconInfoFromPackageName(context, packageName) {

        var iconInfo = MediaTttUtils.getIconInfoFromPackageName(

            context,

            packageName,

            isReceiver = true,

        ) {

            logger.logPackageNotFound(packageName)

        }

packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderCoordinator.kt

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ constructor( 
                routeInfo.name.toString()

            }

        val icon =

            MediaTttUtils.getIconInfoFromPackageName(context, packageName) {

            MediaTttUtils.getIconInfoFromPackageName(context, packageName, isReceiver = false) {

                logger.logPackageNotFound(packageName)

            }

packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/common/MediaTttUtilsTest.kt

+113 −8
Original line number Diff line number Diff line
@@ -65,7 +65,13 @@ class MediaTttUtilsTest : SysuiTestCase() { 


    @Test

    fun getIconInfoFromPackageName_nullPackageName_returnsDefault() {

        val iconInfo = MediaTttUtils.getIconInfoFromPackageName(context, appPackageName = null) {}

        val iconInfo =

            MediaTttUtils.getIconInfoFromPackageName(

                context,

                appPackageName = null,

                isReceiver = false,

            ) {

            }



        assertThat(iconInfo.isAppIcon).isFalse()

        assertThat(iconInfo.contentDescription.loadContentDescription(context))
@@ -73,11 +79,33 @@ class MediaTttUtilsTest : SysuiTestCase() { 
        assertThat(iconInfo.icon).isEqualTo(MediaTttIcon.Resource(R.drawable.ic_cast))

    }



    @Test

    fun getIconInfoFromPackageName_nullPackageName_isReceiver_returnsDefault() {

        val iconInfo =

            MediaTttUtils.getIconInfoFromPackageName(

                context,

                appPackageName = null,

                isReceiver = true,

            ) {

            }



        assertThat(iconInfo.isAppIcon).isFalse()

        assertThat(iconInfo.contentDescription.loadContentDescription(context))

            .isEqualTo(

                context.getString(R.string.media_transfer_receiver_content_description_unknown_app)

            )

        assertThat(iconInfo.icon).isEqualTo(MediaTttIcon.Resource(R.drawable.ic_cast))

    }



    @Test

    fun getIconInfoFromPackageName_nullPackageName_exceptionFnNotTriggered() {

        var exceptionTriggered = false



        MediaTttUtils.getIconInfoFromPackageName(context, appPackageName = null) {

        MediaTttUtils.getIconInfoFromPackageName(

            context,

            appPackageName = null,

            isReceiver = false,

        ) {

            exceptionTriggered = true

        }
@@ -86,7 +114,13 @@ class MediaTttUtilsTest : SysuiTestCase() { 


    @Test

    fun getIconInfoFromPackageName_invalidPackageName_returnsDefault() {

        val iconInfo = MediaTttUtils.getIconInfoFromPackageName(context, "fakePackageName") {}

        val iconInfo =

            MediaTttUtils.getIconInfoFromPackageName(

                context,

                appPackageName = "fakePackageName",

                isReceiver = false,

            ) {

            }



        assertThat(iconInfo.isAppIcon).isFalse()

        assertThat(iconInfo.contentDescription.loadContentDescription(context))
@@ -94,31 +128,102 @@ class MediaTttUtilsTest : SysuiTestCase() { 
        assertThat(iconInfo.icon).isEqualTo(MediaTttIcon.Resource(R.drawable.ic_cast))

    }



    @Test

    fun getIconInfoFromPackageName_invalidPackageName_isReceiver_returnsDefault() {

        val iconInfo =

            MediaTttUtils.getIconInfoFromPackageName(

                context,

                appPackageName = "fakePackageName",

                isReceiver = true,

            ) {

            }



        assertThat(iconInfo.isAppIcon).isFalse()

        assertThat(iconInfo.contentDescription.loadContentDescription(context))

            .isEqualTo(

                context.getString(R.string.media_transfer_receiver_content_description_unknown_app)

            )

        assertThat(iconInfo.icon).isEqualTo(MediaTttIcon.Resource(R.drawable.ic_cast))

    }



    @Test

    fun getIconInfoFromPackageName_invalidPackageName_exceptionFnTriggered() {

        var exceptionTriggered = false



        MediaTttUtils.getIconInfoFromPackageName(context, appPackageName = "fakePackageName") {

            exceptionTriggered = true

        MediaTttUtils.getIconInfoFromPackageName(

            context,

            appPackageName = "fakePackageName",

            isReceiver = false

        ) { exceptionTriggered = true }



        assertThat(exceptionTriggered).isTrue()

    }



    @Test

    fun getIconInfoFromPackageName_invalidPackageName_isReceiver_exceptionFnTriggered() {

        var exceptionTriggered = false



        MediaTttUtils.getIconInfoFromPackageName(

            context,

            appPackageName = "fakePackageName",

            isReceiver = true

        ) { exceptionTriggered = true }



        assertThat(exceptionTriggered).isTrue()

    }



    @Test

    fun getIconInfoFromPackageName_validPackageName_returnsAppInfo() {

        val iconInfo = MediaTttUtils.getIconInfoFromPackageName(context, PACKAGE_NAME) {}

        val iconInfo =

            MediaTttUtils.getIconInfoFromPackageName(

                context,

                PACKAGE_NAME,

                isReceiver = false,

            ) {

            }



        assertThat(iconInfo.isAppIcon).isTrue()

        assertThat(iconInfo.icon).isEqualTo(MediaTttIcon.Loaded(appIconFromPackageName))

        assertThat(iconInfo.contentDescription.loadContentDescription(context)).isEqualTo(APP_NAME)

    }



    @Test

    fun getIconInfoFromPackageName_validPackageName_isReceiver_returnsAppInfo() {

        val iconInfo =

            MediaTttUtils.getIconInfoFromPackageName(

                context,

                PACKAGE_NAME,

                isReceiver = true,

            ) {

            }



        assertThat(iconInfo.isAppIcon).isTrue()

        assertThat(iconInfo.icon).isEqualTo(MediaTttIcon.Loaded(appIconFromPackageName))

        assertThat(iconInfo.contentDescription.loadContentDescription(context))

            .isEqualTo(

                context.getString(

                    R.string.media_transfer_receiver_content_description_with_app_name,

                    APP_NAME

                )

            )

    }



    @Test

    fun getIconInfoFromPackageName_validPackageName_exceptionFnNotTriggered() {

        var exceptionTriggered = false



        MediaTttUtils.getIconInfoFromPackageName(context, PACKAGE_NAME) {

        MediaTttUtils.getIconInfoFromPackageName(context, PACKAGE_NAME, isReceiver = false) {

            exceptionTriggered = true

        }



        assertThat(exceptionTriggered).isFalse()

    }



    @Test

    fun getIconInfoFromPackageName_validPackageName_isReceiver_exceptionFnNotTriggered() {

        var exceptionTriggered = false



        MediaTttUtils.getIconInfoFromPackageName(context, PACKAGE_NAME, isReceiver = true) {

            exceptionTriggered = true

        }