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

Commit beac1064 authored by Craig Mautner's avatar Craig Mautner
Browse files

Layout keyguard according to flags. 

Keyguard layout was being skipped because the previous policy does
not layout the status bar. This change lays out the status bar when
it is serving as the keyguard. This change then allows the keyguard
insets to be resized to make room for the IME when password security
is selected.

Fixes bug 14548156.

Change-Id: Ice4f1072b463a22ec763a0cde69f342206bdd15a
parent 4327e2fb

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