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

Merge changes I7c48a326,I7395ecd4 into pi-dev

Browse Source 
am: 4e4b6ff508

Change-Id: I90fddaaf9a2fd3027d689bf356d2929c93323d5e
This commit is contained in:
Lucas Dupin
2018-04-20 00:38:47 -07:00
committed by android-build-merger
parent b5d0b5f9b5 4e4b6ff508
commit b06836197b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -165,14 +165,15 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
// • The user quickly taps on the display and we show "swipe up to unlock."
// • Keyguard will be dismissed by an action. a.k.a: FLAG_DISMISS_KEYGUARD_ACTIVITY
// • Full-screen user switcher is displayed.
if (mOccluded || mNotificationPanelView.isUnlockHintRunning()
|| mBouncer.willDismissWithAction()
if (mNotificationPanelView.isUnlockHintRunning()) {
mBouncer.setExpansion(1);
} else if (mOccluded || mBouncer.willDismissWithAction()
|| mStatusBar.isFullScreenUserSwitcherState()) {
mBouncer.setExpansion(0);
} else if (mShowing && mStatusBar.isKeyguardCurrentlySecure() && !mDozing) {
} else if (mShowing && !mDozing) {
mBouncer.setExpansion(expansion);
if (expansion != 1 && tracking && !mBouncer.isShowing()
&& !mBouncer.isAnimatingAway()) {
if (expansion != 1 && tracking && mStatusBar.isKeyguardCurrentlySecure()
&& !mBouncer.isShowing() && !mBouncer.isAnimatingAway()) {
mBouncer.show(false /* resetSecuritySelection */, false /* animated */);
}
}