Merge "Fix bug where status bar was not set properly." into sc-dev am: 1b6a8b2255

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15146553 Change-Id: I1e4b057e8a5f75c823eb15a5539c3130ddb06183
2021-06-29 23:16:50 +00:00
parent ffd5acea77 1b6a8b2255
commit 576e567f0f
1 changed files with 4 additions and 2 deletions
@@ -97,8 +97,10 @@ public class ScrimView extends View implements Insettable {
    private void updateSysUiColors() {
        // Use a light system UI (dark icons) if all apps is behind at least half of the
        // status bar.
-        boolean forceChange =
-                getVisibility() == VISIBLE && getAlpha() > STATUS_BAR_COLOR_FORCE_UPDATE_THRESHOLD;
+        final float threshold = STATUS_BAR_COLOR_FORCE_UPDATE_THRESHOLD;
+        boolean forceChange = getVisibility() == VISIBLE
+                && getAlpha() > threshold
+                && (Color.alpha(mBackgroundColor) / 255f) > threshold;
        if (forceChange) {
            getSystemUiController().updateUiState(UI_STATE_SCRIM_VIEW, !isScrimDark());
        } else {