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

Commit 3ad30bf6 authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Layout keyguard according to flags." into lmp-preview-dev

parents c213c7a1 beac1064

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+3 −2
Original line number Diff line number Diff line
@@ -3000,7 +3000,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    public void layoutWindowLw(WindowState win, WindowManager.LayoutParams attrs,

            WindowState attached) {

        // we've already done the status bar

        if (win == mStatusBar || win == mNavigationBar) {

        if ((win == mStatusBar && !doesForceHide(attrs)) || win == mNavigationBar) {

            return;

        }

        final boolean isDefaultDisplay = win.isDefaultDisplay();
@@ -3278,7 +3278,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                            = mOverscanScreenTop + mOverscanScreenHeight;

                } else if (canHideNavigationBar()

                        && (sysUiFl & View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) != 0

                        && (attrs.type == TYPE_TOAST

                        && (attrs.type == TYPE_STATUS_BAR

                            || attrs.type == TYPE_TOAST

                            || (attrs.type >= WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW

                            && attrs.type <= WindowManager.LayoutParams.LAST_SUB_WINDOW))) {

                    // Asking for layout as if the nav bar is hidden, lets the