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

Commit 7de482ba authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

am 5c87f533: Merge "Revert part of fix for b/7377776 to fix b/7411356." into jb-mr1-dev 

* commit '5c87f533':
  Revert part of fix for b/7377776 to fix b/7411356.
parents 0b1b5522 5c87f533

policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java

+0 −7
Original line number Diff line number Diff line
@@ -1309,13 +1309,6 @@ public class KeyguardViewMediator { 
                // (like recents). Temporary enable/disable (e.g. the "back" button) are

                // done in KeyguardHostView.

                flags |= StatusBarManager.DISABLE_RECENT;

                if (!mScreenOn) {

                    // Disable all navbar buttons on screen off.  The navigation bar will hide

                    // these immediately to avoid seeing the end of layout transition animations

                    // if quickly turning back on.

                    flags |= StatusBarManager.DISABLE_HOME;

                    flags |= StatusBarManager.DISABLE_BACK;

                }

                if (isSecure() || !ENABLE_INSECURE_STATUS_BAR_EXPAND) {

                    // showing secure lockscreen; disable expanding.

                    flags |= StatusBarManager.DISABLE_EXPAND;