[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
This commit is contained in:
Matt Pietal
2021-09-16 13:17:52 -04:00
parent abd63e9310
commit 18950dd70d

View File

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