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

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

Merge "[a11y] Getting accessibility focus at pop up icon" into tm-qpr-dev am:... 

Merge "[a11y] Getting accessibility focus at pop up icon" into tm-qpr-dev am: af4af52b am: 6d59c608

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



Change-Id: I6493d2f02ec70f1bf34473421f102e23bf703f69
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e28a0ee0 6d59c608

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

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ abstract class MediaTttChipControllerCommon<T : ChipInfoCommon>( 


        appIconView.contentDescription = appNameOverride ?: iconInfo.iconName

        appIconView.setImageDrawable(appIconDrawableOverride ?: iconInfo.icon)

        return appIconView.contentDescription.toString()

        return appIconView.contentDescription

    }



    /**

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

+4 −1
Original line number Diff line number Diff line
@@ -141,12 +141,13 @@ class MediaTttChipControllerReceiver @Inject constructor( 


    override fun updateChipView(newChipInfo: ChipReceiverInfo, currentChipView: ViewGroup) {

        super.updateChipView(newChipInfo, currentChipView)

        setIcon(

        val iconName = setIcon(

                currentChipView,

                newChipInfo.routeInfo.clientPackageName,

                newChipInfo.appIconDrawableOverride,

                newChipInfo.appNameOverride

        )

        currentChipView.contentDescription = iconName

    }



    override fun animateChipIn(chipView: ViewGroup) {
@@ -159,6 +160,8 @@ class MediaTttChipControllerReceiver @Inject constructor( 
                .alpha(1f)

                .setDuration(5.frames)

                .start()

        // Using withEndAction{} doesn't apply a11y focus when screen is unlocked.

        appIconView.postOnAnimation { chipView.requestAccessibilityFocus() }

        startRipple(chipView.requireViewById(R.id.ripple))

    }