From 473f3a50483534579f366e82e5c0b64636750828 Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Tue, 30 Apr 2019 15:33:28 -0700 Subject: [PATCH] Do not show bouncer field when bouncer is hidden Fixes: 131187491 Test: add locked sim card, go to AOD Test: unlock sim card, look at lock screen Test: swipe up to unlock, enter wrong pattern Change-Id: I6c4ad61879c71734e198590b39f7b25cc127198e --- .../com/android/keyguard/KeyguardMessageArea.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardMessageArea.java b/packages/SystemUI/src/com/android/keyguard/KeyguardMessageArea.java index 0a6885c0ae693..037a8d3146d2e 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardMessageArea.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardMessageArea.java @@ -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) {