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

Merge "Add unlocked to checkmark animation for coex." into udc-dev am: 720e8081d3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23504736

Change-Id: Icb2f70e53552f5b2d33f66c799a2878da04bfe6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-06-01 10:35:42 +00:00
committed by Automerger Merge Worker
parent 58183d6611 720e8081d3
commit 995758644d
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/res/raw/fingerprint_dialogue_unlocked_to_checkmark_success_lottie.json Normal file
View File

File diff suppressed because one or more lines are too long

12
packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFingerprintAndFaceIconController.kt
View File

@@ -21,6 +21,7 @@ import android.content.Context
import com.airbnb.lottie.LottieAnimationView import com.airbnb.lottie.LottieAnimationView
import com.android.systemui.R import com.android.systemui.R
import com.android.systemui.biometrics.AuthBiometricView.BiometricState import com.android.systemui.biometrics.AuthBiometricView.BiometricState
import com.android.systemui.biometrics.AuthBiometricView.STATE_AUTHENTICATED
import com.android.systemui.biometrics.AuthBiometricView.STATE_ERROR import com.android.systemui.biometrics.AuthBiometricView.STATE_ERROR
import com.android.systemui.biometrics.AuthBiometricView.STATE_HELP import com.android.systemui.biometrics.AuthBiometricView.STATE_HELP
import com.android.systemui.biometrics.AuthBiometricView.STATE_PENDING_CONFIRMATION import com.android.systemui.biometrics.AuthBiometricView.STATE_PENDING_CONFIRMATION
@@ -47,13 +48,16 @@ open class AuthBiometricFingerprintAndFaceIconController(
@BiometricState oldState: Int, @BiometricState oldState: Int,
@BiometricState newState: Int @BiometricState newState: Int
): Int? = when (newState) { ): Int? = when (newState) {
STATE_AUTHENTICATED -> {
if (oldState == STATE_PENDING_CONFIRMATION) {
R.raw.fingerprint_dialogue_unlocked_to_checkmark_success_lottie
} else {
super.getAnimationForTransition(oldState, newState)
}
}
STATE_PENDING_CONFIRMATION -> { STATE_PENDING_CONFIRMATION -> {
if (oldState == STATE_ERROR || oldState == STATE_HELP) { if (oldState == STATE_ERROR || oldState == STATE_HELP) {
R.raw.fingerprint_dialogue_error_to_unlock_lottie R.raw.fingerprint_dialogue_error_to_unlock_lottie
} else if (oldState == STATE_PENDING_CONFIRMATION) {
// TODO(jbolinger): missing asset for this transition
// (unlocked icon to success checkmark)
R.raw.fingerprint_dialogue_fingerprint_to_unlock_lottie
} else { } else {
R.raw.fingerprint_dialogue_fingerprint_to_unlock_lottie R.raw.fingerprint_dialogue_fingerprint_to_unlock_lottie
} }