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