commit 1b6a8b225514e88c612b9aeff2179d51889658d3
author Jonathan Miranda <jonmiranda@google.com> Tue Jun 29 23:03:15 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 29 23:03:15 2021 +0000
tree 67cd435a06b0e20aaaee17095608184e15873f6e
parent 419ee4599e6ee70d956bea2809eb1afff1037a55
parent 401b921c190199bb73cc2d2218e9d30911b625a8

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

src/com/android/launcher3/views/ScrimView.java

diff --git a/src/com/android/launcher3/views/ScrimView.java b/src/com/android/launcher3/views/ScrimView.java
index fb1485b..1eb79ad 100644
--- a/src/com/android/launcher3/views/ScrimView.java
+++ b/src/com/android/launcher3/views/ScrimView.java
@@ -97,8 +97,10 @@
     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 {