SystemUIGoogle: Hide now playing icon if not clickable

Change-Id: I4dcd125ca9d9a106c1eeae47a60f0b5106240cd4 Signed-off-by: minaripenguin <minaripenguin@users.noreply.github.com>
PixelOS-AOSP · Aug 28, 2023 · 411b213 · 411b213
1 parent 7f3c624
commit 411b213
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/SystemUIGoogle/src/com/google/android/systemui/ambientmusic/AmbientIndicationContainer.kt b/SystemUIGoogle/src/com/google/android/systemui/ambientmusic/AmbientIndicationContainer.kt
@@ -285,17 +285,19 @@ class AmbientIndicationContainer @JvmOverloads constructor(
         if (TextUtils.isEmpty(text) && !showAmbientMusicText) {
             updatePill = false
         }
-        val vis: Int
-        vis = if (!updatePill) {
+        val vis: Int = if (!updatePill) {
             View.GONE
         } else {
             View.VISIBLE
         }
-        mTextView!!.visibility = vis
-        if (icon == null) {
-            mIconView!!.visibility = View.GONE
+
+        mTextView?.visibility = vis
+
+        val iconView = mIconView
+        if (icon == null || (iconView != null && !iconView.isClickable)) {
+            iconView?.visibility = View.GONE
         } else {
-            mIconView!!.visibility = vis
+            iconView?.visibility = vis
         }
         if (!updatePill) {
             mTextView!!.animate().cancel()