Merge "Don't show UDFPS when statusBarState != KEYGUARD" into udc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
d17b0d90d8
@@ -390,11 +390,14 @@ constructor(
|
||||
return true
|
||||
}
|
||||
|
||||
// Only pause auth if we're not on the keyguard AND we're not transitioning to doze
|
||||
// (ie: dozeAmount = 0f). For the UnlockedScreenOffAnimation, the statusBarState is
|
||||
// Only pause auth if we're not on the keyguard AND we're not transitioning to doze.
|
||||
// For the UnlockedScreenOffAnimation, the statusBarState is
|
||||
// delayed. However, we still animate in the UDFPS affordance with the
|
||||
// mUnlockedScreenOffDozeAnimator.
|
||||
if (statusBarState != StatusBarState.KEYGUARD && lastDozeAmount == 0f) {
|
||||
// unlockedScreenOffDozeAnimator.
|
||||
if (
|
||||
statusBarState != StatusBarState.KEYGUARD &&
|
||||
!unlockedScreenOffAnimationController.isAnimationPlaying()
|
||||
) {
|
||||
return true
|
||||
}
|
||||
if (isBouncerExpansionGreaterThan(.5f)) {
|
||||
|
||||
Reference in New Issue
Block a user