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

Merge "Fix issue where keyguard wouldn't be dismissed" into oc-dr1-dev

Browse Source
This commit is contained in:
Lucas Dupin
2017-08-09 16:58:44 +00:00
committed by Android (Google) Code Review
parent d72954af31 28f9029fde
commit 94f8143129
1 changed files with 3 additions and 2 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

@@ -113,7 +113,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
// Since we won't get a setOccluded call we have to reset the view manually such that
// the bouncer goes away.
if (mOccluded) {
reset(false /* hideBouncerWhenShowing */);
reset(true /* hideBouncerWhenShowing */);
}
}
};
@@ -316,6 +316,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
return;
}
}
boolean isOccluding = !mOccluded && occluded;
mOccluded = occluded;
if (mShowing) {
mStatusBar.updateMediaMetaData(false, animate && !occluded);
@@ -326,7 +327,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
if (!mDozing) {
// If Keyguard is reshown, don't hide the bouncer as it might just have been requested
// by a FLAG_DISMISS_KEYGUARD_ACTIVITY.
reset(false /* hideBouncerWhenShowing*/);
reset(isOccluding /* hideBouncerWhenShowing*/);
}
if (animate && !occluded && mShowing) {
mStatusBar.animateKeyguardUnoccluding();