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

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

Change-Id: I0d0cb40ba9bf1bad31c04ff9b0691c166bbf05ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jordan Demeulenaere
2023-01-12 10:12:37 +00:00
committed by Automerger Merge Worker

View File

@@ -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