Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 379ac2d8: Merge "Fix broken status bar when activity is showing above keyguard"

Browse Source 
* commit '379ac2d8b69065eb22ee24d9f3e4d90ec62bc413':
  Fix broken status bar when activity is showing above keyguard
This commit is contained in:
Adrian Roos
2014-04-17 18:12:03 +00:00
committed by Android Git Automerger
parent 147eb42d27 379ac2d8b6
commit 9fd78cd5db
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
View File

@@ -56,6 +56,7 @@ public class StatusBarKeyguardViewManager {
private boolean mScreenOn = false;
private KeyguardBouncer mBouncer;
private boolean mShowing;
private boolean mOccluded = false;
public StatusBarKeyguardViewManager(Context context, ViewMediatorCallback callback,
LockPatternUtils lockPatternUtils) {
@@ -102,8 +103,10 @@ public class StatusBarKeyguardViewManager {
}
public void showBouncer() {
mBouncer.show();
updateBackButtonState();
if (!mOccluded) {
mBouncer.show();
updateBackButtonState();
}
}
/**
@@ -152,6 +155,13 @@ public class StatusBarKeyguardViewManager {
}
public void setOccluded(boolean occluded) {
mOccluded = occluded;
if (occluded) {
mPhoneStatusBar.hideKeyguard();
mBouncer.hide();
} else {
showBouncerOrKeyguard();
}
mStatusBarWindowManager.setKeyguardOccluded(occluded);
}