| commit | 576e567f0f898b8c936160a0c03a14e0e0ae4d90 | [log] [tgz] |
|---|---|---|
| author | Jonathan Miranda <jonmiranda@google.com> | Tue Jun 29 23:16:50 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 29 23:16:50 2021 +0000 |
| tree | 9ceafaa6c4bd0b5f71890195d0763b41edc2af45 | |
| parent | ffd5acea77c100e3067e4b3a440f292ab7f6d053 [diff] | |
| parent | 1b6a8b225514e88c612b9aeff2179d51889658d3 [diff] |
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
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 {