Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9130ed5f authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Don't show now playing in new rotating text area" into sc-dev am: 381a7116 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3543223c58793b4b4d75093dd1e3121f2952efa
parents e3bcee63 381a7116

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -103,6 +103,11 @@ public class KeyguardIndicationRotateTextViewController extends 
     */

     */

    public void updateIndication(@IndicationType int type, KeyguardIndication newIndication,

    public void updateIndication(@IndicationType int type, KeyguardIndication newIndication,

            boolean showImmediately) {

            boolean showImmediately) {

        if (type == INDICATION_TYPE_NOW_PLAYING

                || type == INDICATION_TYPE_REVERSE_CHARGING) {

            // temporarily don't show here, instead use AmbientContainer b/181049781

            return;

        }

        final boolean hasPreviousIndication = mIndicationMessages.get(type) != null;

        final boolean hasPreviousIndication = mIndicationMessages.get(type) != null;

        final boolean hasNewIndication = newIndication != null;

        final boolean hasNewIndication = newIndication != null;

        if (!hasNewIndication) {

        if (!hasNewIndication) {