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

Commit 3b7f61d2 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere Committed by Automerger Merge Worker
Browse files

Merge "Use the correct FGS View when animating into a dialog" into tm-qpr-dev... 

Merge "Use the correct FGS View when animating into a dialog" into tm-qpr-dev am: ca773490 am: 75a91c53

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



Change-Id: I0fea5d21d5216b2daacf5fe7557dfcfc8920c0b8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ea944c76 75a91c53

packages/SystemUI/src/com/android/systemui/qs/footer/ui/binder/FooterActionsViewBinder.kt

+2 −2
Original line number Original line Diff line number Diff line
@@ -219,9 +219,9 @@ object FooterActionsViewBinder { 
            // Small button with the number only.

            // Small button with the number only.

            foregroundServicesWithTextView.isVisible = false

            foregroundServicesWithTextView.isVisible = false





            foregroundServicesWithNumberView.visibility = View.VISIBLE

            foregroundServicesWithNumberView.isVisible = true

            foregroundServicesWithNumberView.setOnClickListener {

            foregroundServicesWithNumberView.setOnClickListener {

                foregroundServices.onClick(Expandable.fromView(foregroundServicesWithTextView))

                foregroundServices.onClick(Expandable.fromView(foregroundServicesWithNumberView))

            }

            }

            foregroundServicesWithNumberHolder.number.text = foregroundServicesCount.toString()

            foregroundServicesWithNumberHolder.number.text = foregroundServicesCount.toString()

            foregroundServicesWithNumberHolder.number.contentDescription = foregroundServices.text

            foregroundServicesWithNumberHolder.number.contentDescription = foregroundServices.text