Merge "AOD: Show keyguard indications in white" into oc-dr1-dev

am: ec05633f5f

Change-Id: If3c93807c34241dd5d97502eaf225f14c3527e45
This commit is contained in:
Adrian Roos
2017-07-25 17:43:14 +00:00
committed by android-build-merger

View File

@@ -280,13 +280,10 @@ public class KeyguardIndicationController {
if (mDozing) {
// If we're dozing, never show a persistent indication.
if (!TextUtils.isEmpty(mTransientIndication)) {
// When dozing we ignore the initial text color and use white instead.
// We don't wait to draw black text on a black background.
int color = mTransientTextColor == mInitialTextColor ?
Color.WHITE : mTransientTextColor;
// When dozing we ignore any text color and use white instead, because
// colors can be hard to read in low brightness.
mTextView.setTextColor(Color.WHITE);
mTextView.switchIndication(mTransientIndication);
mTextView.setTextColor(color);
} else {
mTextView.switchIndication(null);
}