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 
* changes:
  Fix wrong bouncer translation during hint animation
  Keep animating bouncer when fingerprint
This commit is contained in:
TreeHugger Robot
2018-04-20 07:26:35 +00:00
committed by Android (Google) Code Review
parent 6cc4575ced d7344dcd6c
commit 4e4b6ff508
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." // • 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 // • Keyguard will be dismissed by an action. a.k.a: FLAG_DISMISS_KEYGUARD_ACTIVITY
// • Full-screen user switcher is displayed. // • Full-screen user switcher is displayed.
if (mOccluded || mNotificationPanelView.isUnlockHintRunning() if (mNotificationPanelView.isUnlockHintRunning()) {
|| mBouncer.willDismissWithAction() mBouncer.setExpansion(1);
} else if (mOccluded || mBouncer.willDismissWithAction()
|| mStatusBar.isFullScreenUserSwitcherState()) { || mStatusBar.isFullScreenUserSwitcherState()) {
mBouncer.setExpansion(0); mBouncer.setExpansion(0);
} else if (mShowing && mStatusBar.isKeyguardCurrentlySecure() && !mDozing) { } else if (mShowing && !mDozing) {
mBouncer.setExpansion(expansion); mBouncer.setExpansion(expansion);
if (expansion != 1 && tracking && !mBouncer.isShowing() if (expansion != 1 && tracking && mStatusBar.isKeyguardCurrentlySecure()
&& !mBouncer.isAnimatingAway()) { && !mBouncer.isShowing() && !mBouncer.isAnimatingAway()) {
mBouncer.show(false /* resetSecuritySelection */, false /* animated */); mBouncer.show(false /* resetSecuritySelection */, false /* animated */);
} }
} }