Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 990e5074 authored by Tiger Huang's avatar Tiger Huang Committed by Android (Google) Code Review
Browse files

Merge "Reset status bar color when setting mEdgeToEdgeEnforced" into main

parents c8e51f85 c3203dde
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -2501,6 +2501,9 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
        if (mEdgeToEdgeEnforced) {
            getAttributes().privateFlags |= PRIVATE_FLAG_EDGE_TO_EDGE_ENFORCED;
            mDecorFitsSystemWindows = false;
            mStatusBarColor = Color.TRANSPARENT;
            mNavigationBarDividerColor = Color.TRANSPARENT;
            // mNavigationBarColor is not reset here because it might be used to draw the scrim.
        }
        if (CompatChanges.isChangeEnabled(OVERRIDE_LAYOUT_IN_DISPLAY_CUTOUT_MODE)
                && !a.getBoolean(R.styleable.Window_windowOptOutEdgeToEdgeEnforcement,