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

Merge "AOD: Hide SIM PIN entry while dozing" into oc-dr1-dev

Browse Source 
am: 4a51e275db

Change-Id: Ibf1bc449bf63e24ffec1fffc3634d4a4c5e281b8
This commit is contained in:
Adrian Roos
2017-06-30 17:01:01 +00:00
committed by android-build-merger
parent 4c201983cf 4a51e275db
commit 1d42219ec5
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,7 +152,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
* {@link KeyguardBouncer#needsFullscreenBouncer()}. * {@link KeyguardBouncer#needsFullscreenBouncer()}.
*/ */
protected void showBouncerOrKeyguard(boolean hideBouncerWhenShowing) { protected void showBouncerOrKeyguard(boolean hideBouncerWhenShowing) {
if (mBouncer.needsFullscreenBouncer()) { if (mBouncer.needsFullscreenBouncer() && !mDozing) {
// The keyguard might be showing (already). So we need to hide it. // The keyguard might be showing (already). So we need to hide it.
mStatusBar.hideKeyguard(); mStatusBar.hideKeyguard();
@@ -258,9 +258,12 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
} }
public void setDozing(boolean dozing) { public void setDozing(boolean dozing) {
if (mDozing != dozing) {
mDozing = dozing; mDozing = dozing;
reset(dozing /* hideBouncerWhenShowing */);
updateStates(); updateStates();
} }
}
public void onScreenTurnedOff() { public void onScreenTurnedOff() {
mScreenTurnedOn = false; mScreenTurnedOn = false;