[DO NOT MERGE] Ambient music - Update for favoriting intent am: 182349e898

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

Change-Id: I923142cc6f111604a42f8d00c6d84481198e3b03
This commit is contained in:
Matt Pietal
2021-09-20 14:20:28 +00:00
committed by Automerger Merge Worker

View File

@@ -100,8 +100,7 @@ public class KeyguardIndicationRotateTextViewController extends
*/ */
public void updateIndication(@IndicationType int type, KeyguardIndication newIndication, public void updateIndication(@IndicationType int type, KeyguardIndication newIndication,
boolean updateImmediately) { boolean updateImmediately) {
if (type == INDICATION_TYPE_NOW_PLAYING if (type == INDICATION_TYPE_REVERSE_CHARGING) {
|| type == INDICATION_TYPE_REVERSE_CHARGING) {
// temporarily don't show here, instead use AmbientContainer b/181049781 // temporarily don't show here, instead use AmbientContainer b/181049781
return; return;
} }
@@ -303,7 +302,6 @@ public class KeyguardIndicationRotateTextViewController extends
public static final int INDICATION_TYPE_TRUST = 6; public static final int INDICATION_TYPE_TRUST = 6;
public static final int INDICATION_TYPE_RESTING = 7; public static final int INDICATION_TYPE_RESTING = 7;
public static final int INDICATION_TYPE_USER_LOCKED = 8; 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; public static final int INDICATION_TYPE_REVERSE_CHARGING = 10;
@IntDef({ @IntDef({
@@ -317,7 +315,6 @@ public class KeyguardIndicationRotateTextViewController extends
INDICATION_TYPE_TRUST, INDICATION_TYPE_TRUST,
INDICATION_TYPE_RESTING, INDICATION_TYPE_RESTING,
INDICATION_TYPE_USER_LOCKED, INDICATION_TYPE_USER_LOCKED,
INDICATION_TYPE_NOW_PLAYING,
INDICATION_TYPE_REVERSE_CHARGING, INDICATION_TYPE_REVERSE_CHARGING,
}) })
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)