Merge "Check that alpha is zero instead of transparent color to decide scrim" into qt-dev

am: 1abc45038b

Change-Id: I53601e0d7d9f747a339f7db3a2d36a1dffa5bb38
This commit is contained in:
Winson Chung
2019-07-02 11:20:08 -07:00
committed by android-build-merger

View File

@@ -1311,7 +1311,7 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
return semiTransparentBarColor; return semiTransparentBarColor;
} else if ((flags & FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) == 0) { } else if ((flags & FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) == 0) {
return Color.BLACK; return Color.BLACK;
} else if (scrimTransparent && barColor == Color.TRANSPARENT) { } else if (scrimTransparent && Color.alpha(barColor) == 0) {
boolean light = (sysuiVis & lightSysuiFlag) != 0; boolean light = (sysuiVis & lightSysuiFlag) != 0;
return light ? SCRIM_LIGHT : semiTransparentBarColor; return light ? SCRIM_LIGHT : semiTransparentBarColor;
} else { } else {