Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Always show alt bouncer text in white" into sc-v2-dev am: 9f1752d9a1

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

Change-Id: Ia93eca6fa7ccb54bc4d9cd684991b0b63b7d27eb
This commit is contained in:
TreeHugger Robot
2021-10-05 17:55:45 +00:00
committed by Automerger Merge Worker
parent 15f4b26146 9f1752d9a1
commit 099060fadd
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/keyguard/KeyguardMessageArea.java
View File

@@ -153,6 +153,10 @@ public class KeyguardMessageArea extends TextView implements SecurityMessageDisp
colorState = mNextMessageColorState; colorState = mNextMessageColorState;
mNextMessageColorState = ColorStateList.valueOf(DEFAULT_COLOR); 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); setTextColor(colorState);
} }

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

@@ -1149,7 +1149,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
public void showBouncerMessage(String message, ColorStateList colorState) { public void showBouncerMessage(String message, ColorStateList colorState) {
if (isShowingAlternateAuth()) { if (isShowingAlternateAuth()) {
if (mKeyguardMessageAreaController != null) { if (mKeyguardMessageAreaController != null) {
mKeyguardMessageAreaController.setNextMessageColor(colorState);
mKeyguardMessageAreaController.setMessage(message); mKeyguardMessageAreaController.setMessage(message);
} }
} else { } else {