Merge "AOD: Show keyguard indications in white" into oc-dr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
ec05633f5f
@@ -280,13 +280,10 @@ public class KeyguardIndicationController {
|
|||||||
if (mDozing) {
|
if (mDozing) {
|
||||||
// If we're dozing, never show a persistent indication.
|
// If we're dozing, never show a persistent indication.
|
||||||
if (!TextUtils.isEmpty(mTransientIndication)) {
|
if (!TextUtils.isEmpty(mTransientIndication)) {
|
||||||
// When dozing we ignore the initial text color and use white instead.
|
// When dozing we ignore any text color and use white instead, because
|
||||||
// We don't wait to draw black text on a black background.
|
// colors can be hard to read in low brightness.
|
||||||
int color = mTransientTextColor == mInitialTextColor ?
|
mTextView.setTextColor(Color.WHITE);
|
||||||
Color.WHITE : mTransientTextColor;
|
|
||||||
mTextView.switchIndication(mTransientIndication);
|
mTextView.switchIndication(mTransientIndication);
|
||||||
mTextView.setTextColor(color);
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
mTextView.switchIndication(null);
|
mTextView.switchIndication(null);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user