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

Commit 64d04347 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Always allow translucent bars for keyguard" into lmp-dev

parents ffad70bb 4fb3ee31

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

+8 −3
Original line number Original line Diff line number Diff line
@@ -2978,7 +2978,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            boolean immersiveSticky = (sysui & View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY) != 0;

            boolean immersiveSticky = (sysui & View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY) != 0;

            boolean navAllowedHidden = immersive || immersiveSticky;

            boolean navAllowedHidden = immersive || immersiveSticky;

            navTranslucent &= !immersiveSticky;  // transient trumps translucent

            navTranslucent &= !immersiveSticky;  // transient trumps translucent

            boolean isKeyguardShowing = isStatusBarKeyguard() && !mHideLockScreen;

            if (!isKeyguardShowing) {

                navTranslucent &= areTranslucentBarsAllowed();

                navTranslucent &= areTranslucentBarsAllowed();

            }





            // When the navigation bar isn't visible, we put up a fake

            // When the navigation bar isn't visible, we put up a fake

            // input window to catch all touch events.  This way we can

            // input window to catch all touch events.  This way we can
@@ -3102,7 +3105,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                boolean statusBarTransient = (sysui & View.STATUS_BAR_TRANSIENT) != 0;

                boolean statusBarTransient = (sysui & View.STATUS_BAR_TRANSIENT) != 0;

                boolean statusBarTranslucent = (sysui

                boolean statusBarTranslucent = (sysui

                        & (View.STATUS_BAR_TRANSLUCENT | View.SYSTEM_UI_TRANSPARENT)) != 0;

                        & (View.STATUS_BAR_TRANSLUCENT | View.SYSTEM_UI_TRANSPARENT)) != 0;

                if (!isKeyguardShowing) {

                    statusBarTranslucent &= areTranslucentBarsAllowed();

                    statusBarTranslucent &= areTranslucentBarsAllowed();

                }





                // If the status bar is hidden, we don't want to cause

                // If the status bar is hidden, we don't want to cause

                // windows behind it to scroll.

                // windows behind it to scroll.
@@ -5611,7 +5616,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            vis = (vis & ~flags) | (oldVis & flags);

            vis = (vis & ~flags) | (oldVis & flags);

        }

        }





        if (!areTranslucentBarsAllowed()) {

        if (!areTranslucentBarsAllowed() && transWin != mStatusBar) {

            vis &= ~(View.NAVIGATION_BAR_TRANSLUCENT | View.STATUS_BAR_TRANSLUCENT

            vis &= ~(View.NAVIGATION_BAR_TRANSLUCENT | View.STATUS_BAR_TRANSLUCENT

                    | View.SYSTEM_UI_TRANSPARENT);

                    | View.SYSTEM_UI_TRANSPARENT);

        }

        }