diff options
| author | 2021-10-05 17:50:28 +0000 | |
|---|---|---|
| committer | 2021-10-05 17:50:28 +0000 | |
| commit | 9f1752d9a1201bcd4d75ae6a687300aba36e9cc8 (patch) | |
| tree | da44666a8732d3d5c4efa9eebae84d30aec7bcc1 | |
| parent | c1301ad7bc49eede54a8e73bb8c23a2f769551d6 (diff) | |
| parent | a4825477a7b3d3a497c64b37b9c149bb9f616609 (diff) | |
Merge "Always show alt bouncer text in white" into sc-v2-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/keyguard/KeyguardMessageArea.java | 4 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardMessageArea.java b/packages/SystemUI/src/com/android/keyguard/KeyguardMessageArea.java index 62411dbff5fd..11eeac2272ff 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardMessageArea.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardMessageArea.java @@ -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); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java index 5bc97a5b316d..18fd9d3c6651 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -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 { |