Fixed a bug where the dozemode was incorrectly applied
This could lead to invisible white text.
Bug: 27147160
Change-Id: I1196c251c795a7e271545405fb3936bcbb84cb19
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
index 647f0bf..bc85922 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
@@ -523,7 +523,13 @@
}
public void setDark(boolean dark, boolean fade, long delay) {
- if (mDark == dark || mContractedChild == null) return;
+ setDark(dark, fade, delay, false /* force */);
+ }
+
+ public void setDark(boolean dark, boolean fade, long delay, boolean force) {
+ if ((!force && mDark == dark) || mContractedChild == null) {
+ return;
+ }
mDark = dark;
dark = dark && !mShowingLegacyBackground;
if (mVisibleType == VISIBLE_TYPE_CONTRACTED || !dark) {
@@ -571,7 +577,6 @@
selectLayout(false /* animate */, true /* force */);
if (mContractedChild != null) {
mContractedWrapper.notifyContentUpdated(entry.notification);
- mContractedWrapper.setDark(mDark, false /* animate */, 0 /* delay */);
}
if (mExpandedChild != null) {
mExpandedWrapper.notifyContentUpdated(entry.notification);
@@ -579,6 +584,7 @@
if (mHeadsUpChild != null) {
mHeadsUpWrapper.notifyContentUpdated(entry.notification);
}
+ setDark(mDark, false /* animate */, 0 /* delay */, true /* force */);
}
private void updateSingleLineView() {