From 182349e898d9340ce7dcd350bf273530bcf82245 Mon Sep 17 00:00:00 2001 From: Matt Pietal Date: Thu, 16 Sep 2021 13:17:52 -0400 Subject: [DO NOT MERGE] Ambient music - Update for favoriting intent Support tapping the icon to allow for directly favoriting the song. If no favoriting intent is set, fallback to using the other PendingIntent to open the 'now playing' music list. Also, cleanup all legacy code that was showing ambient music inside the indication area. Fixes: 199879413 Test: atest AmbientIndicationServiceTest Change-Id: If06865fb78f15d247900c717d4021e1c20b2e9cc --- .../keyguard/KeyguardIndicationRotateTextViewController.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java index 2d215e0f1f62..a424674ed252 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java @@ -100,8 +100,7 @@ public class KeyguardIndicationRotateTextViewController extends */ public void updateIndication(@IndicationType int type, KeyguardIndication newIndication, boolean updateImmediately) { - if (type == INDICATION_TYPE_NOW_PLAYING - || type == INDICATION_TYPE_REVERSE_CHARGING) { + if (type == INDICATION_TYPE_REVERSE_CHARGING) { // temporarily don't show here, instead use AmbientContainer b/181049781 return; } @@ -303,7 +302,6 @@ public class KeyguardIndicationRotateTextViewController extends public static final int INDICATION_TYPE_TRUST = 6; public static final int INDICATION_TYPE_RESTING = 7; public static final int INDICATION_TYPE_USER_LOCKED = 8; - public static final int INDICATION_TYPE_NOW_PLAYING = 9; public static final int INDICATION_TYPE_REVERSE_CHARGING = 10; @IntDef({ @@ -317,7 +315,6 @@ public class KeyguardIndicationRotateTextViewController extends INDICATION_TYPE_TRUST, INDICATION_TYPE_RESTING, INDICATION_TYPE_USER_LOCKED, - INDICATION_TYPE_NOW_PLAYING, INDICATION_TYPE_REVERSE_CHARGING, }) @Retention(RetentionPolicy.SOURCE) -- cgit v1.2.3-59-g8ed1b