| commit | f8f3854a0e64f347388831b75d1ba72889739eff | [log] [tgz] |
|---|---|---|
| author | Jonathan Miranda <jonmiranda@google.com> | Tue Jun 29 23:26:28 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 29 23:26:28 2021 +0000 |
| tree | 8abf1a45f59177862376eec6607b63cd7408c5df | |
| parent | fb54677ddb5ab28ae2d14bbb752127102c067879 [diff] | |
| parent | 77c4417f7a3af941020081684a16c824077d7c82 [diff] |
Merge "Fix bug where status bar was not set properly." into sc-dev am: 1b6a8b2255 am: 77c4417f7a Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15146553 Change-Id: Ib830e5d5afe9ed6f2d07602d195a09e7ec20f9b4
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 {