From 411b213c0f093beda5cdf3f249a75669caf12709 Mon Sep 17 00:00:00 2001 From: minaripenguin Date: Wed, 9 Aug 2023 00:00:45 +0800 Subject: [PATCH] SystemUIGoogle: Hide now playing icon if not clickable Change-Id: I4dcd125ca9d9a106c1eeae47a60f0b5106240cd4 Signed-off-by: minaripenguin --- .../ambientmusic/AmbientIndicationContainer.kt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/SystemUIGoogle/src/com/google/android/systemui/ambientmusic/AmbientIndicationContainer.kt b/SystemUIGoogle/src/com/google/android/systemui/ambientmusic/AmbientIndicationContainer.kt index b722c79..90dccb6 100644 --- 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()