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

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

Merge "Do not show bouncer field when bouncer is hidden" into qt-dev

parents fdb2425c 473f3a50

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

+11 −3
Original line number Diff line number Diff line
@@ -59,14 +59,22 @@ public class KeyguardMessageArea extends TextView implements SecurityMessageDisp 
    private ColorStateList mDefaultColorState;

    private CharSequence mMessage;

    private ColorStateList mNextMessageColorState = ColorStateList.valueOf(DEFAULT_COLOR);

    private boolean mBouncerVisible;



    private KeyguardUpdateMonitorCallback mInfoCallback = new KeyguardUpdateMonitorCallback() {

        public void onFinishedGoingToSleep(int why) {

            setSelected(false);

        };

        }



        public void onStartedWakingUp() {

            setSelected(true);

        };

        }



        @Override

        public void onKeyguardBouncerChanged(boolean bouncer) {

            mBouncerVisible = bouncer;

            update();

        }

    };



    public KeyguardMessageArea(Context context) {
@@ -188,7 +196,7 @@ public class KeyguardMessageArea extends TextView implements SecurityMessageDisp 


    private void update() {

        CharSequence status = mMessage;

        setVisibility(TextUtils.isEmpty(status) ? INVISIBLE : VISIBLE);

        setVisibility(TextUtils.isEmpty(status) || !mBouncerVisible ? INVISIBLE : VISIBLE);

        setText(status);

        ColorStateList colorState = mDefaultColorState;

        if (mNextMessageColorState.getDefaultColor() != DEFAULT_COLOR) {