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

Commit e1fec240 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Properly disable status bar on secure lockscreens."

parents c498ad6e 8b08b886
Loading
Loading
Loading
Loading
+5 −4
Original line number Original line Diff line number Diff line
@@ -1138,12 +1138,13 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
                }
                }
            }
            }


            // if the keyguard is shown, allow the status bar to open
            // if the keyguard is shown, allow the status bar to open only if the keyguard is
            // only if the keyguard is insecure and is covered by another window
            // insecure and (is covered by another window OR this feature is enabled in general)
            boolean enable = !mShowing || (mHidden && !isSecure());
            boolean enable = !mShowing
                || ((ENABLE_STATUS_BAR_IN_KEYGUARD || mHidden) && !isSecure());
            mStatusBarManager.disable(enable ?
            mStatusBarManager.disable(enable ?
                         StatusBarManager.DISABLE_NONE :
                         StatusBarManager.DISABLE_NONE :
                         ( (ENABLE_STATUS_BAR_IN_KEYGUARD ? 0 : StatusBarManager.DISABLE_EXPAND)
                         ( StatusBarManager.DISABLE_EXPAND
                         | StatusBarManager.DISABLE_NAVIGATION
                         | StatusBarManager.DISABLE_NAVIGATION
                         | StatusBarManager.DISABLE_CLOCK));
                         | StatusBarManager.DISABLE_CLOCK));
        }
        }