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

Commit 9f1752d9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Always show alt bouncer text in white" into sc-v2-dev

parents c1301ad7 a4825477

packages/SystemUI/src/com/android/keyguard/KeyguardMessageArea.java

+4 −0
Original line number Diff line number Diff line
@@ -153,6 +153,10 @@ public class KeyguardMessageArea extends TextView implements SecurityMessageDisp 
            colorState = mNextMessageColorState;

            mNextMessageColorState = ColorStateList.valueOf(DEFAULT_COLOR);

        }

        if (mAltBouncerShowing) {

            // alt bouncer has a black scrim, so always show the text in white

            colorState = ColorStateList.valueOf(Color.WHITE);

        }

        setTextColor(colorState);

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

+0 −1
Original line number Diff line number Diff line
@@ -1149,7 +1149,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
    public void showBouncerMessage(String message, ColorStateList colorState) {

        if (isShowingAlternateAuth()) {

            if (mKeyguardMessageAreaController != null) {

                mKeyguardMessageAreaController.setNextMessageColor(colorState);

                mKeyguardMessageAreaController.setMessage(message);

            }

        } else {