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

Merge "Rename BP assets to lowercase" into tm-qpr-dev am: b43b45703e am: b969d79848

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

Change-Id: Id53ac08328c8aa459853390846ab780929f33d79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Peter Kalauskas
2022-09-09 00:56:32 +00:00
committed by Automerger Merge Worker
parent 9288af93f7 b969d79848
commit 0297d25d05
16 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
packages/SystemUI/res/raw/BiometricPrompt_Fingerprint_To_Error_Landscape.json → packages/SystemUI/res/raw/biometricprompt_fingerprint_to_error_landscape.json
View File

2
packages/SystemUI/res/raw/BiometricPrompt_Landscape_Base.json → packages/SystemUI/res/raw/biometricprompt_landscape_base.json
View File

File diff suppressed because one or more lines are too long

2
packages/SystemUI/res/raw/BiometricPrompt_Portrait_Base_BottomRight.json → packages/SystemUI/res/raw/biometricprompt_portrait_base_bottomright.json
View File

File diff suppressed because one or more lines are too long

2
packages/SystemUI/res/raw/BiometricPrompt_Portrait_Base_TopLeft.json → packages/SystemUI/res/raw/biometricprompt_portrait_base_topleft.json
View File

File diff suppressed because one or more lines are too long

2
packages/SystemUI/res/raw/BiometricPrompt_Symbol_Error_To_Fingerprint_Landscape.json → packages/SystemUI/res/raw/biometricprompt_symbol_error_to_fingerprint_landscape.json
View File

File diff suppressed because one or more lines are too long

2
packages/SystemUI/res/raw/BiometricPrompt_Symbol_Error_To_Fingerprint_Portrait_BottomRight.json → packages/SystemUI/res/raw/biometricprompt_symbol_error_to_fingerprint_portrait_bottomright.json
View File

File diff suppressed because one or more lines are too long

2
packages/SystemUI/res/raw/BiometricPrompt_Symbol_Error_To_Fingerprint_Portrait_TopLeft.json → packages/SystemUI/res/raw/biometricprompt_symbol_error_to_fingerprint_portrait_topleft.json
View File

File diff suppressed because one or more lines are too long

2
packages/SystemUI/res/raw/BiometricPrompt_Symbol_Error_To_Success_Landscape.json → packages/SystemUI/res/raw/biometricprompt_symbol_error_to_success_landscape.json
View File

File diff suppressed because one or more lines are too long

2
packages/SystemUI/res/raw/BiometricPrompt_Symbol_Error_To_Success_Portrait_BottomRight.json → packages/SystemUI/res/raw/biometricprompt_symbol_error_to_success_portrait_bottomright.json
View File

File diff suppressed because one or more lines are too long

2
packages/SystemUI/res/raw/BiometricPrompt_Symbol_Error_To_Success_Portrait_TopLeft.json → packages/SystemUI/res/raw/biometricprompt_symbol_error_to_success_portrait_topleft.json
View File

File diff suppressed because one or more lines are too long

2
packages/SystemUI/res/raw/BiometricPrompt_Symbol_Fingerprint_To_Error_Portrait_BottomRight.json → packages/SystemUI/res/raw/biometricprompt_symbol_fingerprint_to_error_portrait_bottomright.json
View File

File diff suppressed because one or more lines are too long

2
packages/SystemUI/res/raw/BiometricPrompt_Symbol_Fingerprint_To_Error_Portrait_TopLeft.json → packages/SystemUI/res/raw/biometricprompt_symbol_fingerprint_to_error_portrait_topleft.json
View File

File diff suppressed because one or more lines are too long

2
packages/SystemUI/res/raw/BiometricPrompt_Symbol_Fingerprint_To_Success_Landscape.json → packages/SystemUI/res/raw/biometricprompt_symbol_fingerprint_to_success_landscape.json
View File

File diff suppressed because one or more lines are too long

2
packages/SystemUI/res/raw/BiometricPrompt_Symbol_Fingerprint_To_Success_Portrait_BottomRight.json → packages/SystemUI/res/raw/biometricprompt_symbol_fingerprint_to_success_portrait_bottomright.json
View File

File diff suppressed because one or more lines are too long

2
packages/SystemUI/res/raw/BiometricPrompt_Symbol_Fingerprint_To_Success_Portrait_TopLeft.json → packages/SystemUI/res/raw/biometricprompt_symbol_fingerprint_to_success_portrait_topleft.json
View File

File diff suppressed because one or more lines are too long

60
packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFingerprintIconController.kt
View File

@@ -187,11 +187,11 @@ open class AuthBiometricFingerprintIconController(
@RawRes
private fun getSideFpsAnimationForTransition(rotation: Int): Int = when (rotation) {
Surface.ROTATION_0 -> R.raw.BiometricPrompt_Landscape_Base
Surface.ROTATION_90 -> R.raw.BiometricPrompt_Portrait_Base_TopLeft
Surface.ROTATION_180 -> R.raw.BiometricPrompt_Landscape_Base
Surface.ROTATION_270 -> R.raw.BiometricPrompt_Portrait_Base_BottomRight
else -> R.raw.BiometricPrompt_Landscape_Base
Surface.ROTATION_0 -> R.raw.biometricprompt_landscape_base
Surface.ROTATION_90 -> R.raw.biometricprompt_portrait_base_topleft
Surface.ROTATION_180 -> R.raw.biometricprompt_landscape_base
Surface.ROTATION_270 -> R.raw.biometricprompt_portrait_base_bottomright
else -> R.raw.biometricprompt_landscape_base
}
@RawRes
@@ -203,14 +203,14 @@ open class AuthBiometricFingerprintIconController(
STATE_HELP,
STATE_ERROR -> {
when (rotation) {
Surface.ROTATION_0 -> R.raw.BiometricPrompt_Fingerprint_To_Error_Landscape
Surface.ROTATION_0 -> R.raw.biometricprompt_fingerprint_to_error_landscape
Surface.ROTATION_90 ->
R.raw.BiometricPrompt_Symbol_Fingerprint_To_Error_Portrait_TopLeft
R.raw.biometricprompt_symbol_fingerprint_to_error_portrait_topleft
Surface.ROTATION_180 ->
R.raw.BiometricPrompt_Fingerprint_To_Error_Landscape
R.raw.biometricprompt_fingerprint_to_error_landscape
Surface.ROTATION_270 ->
R.raw.BiometricPrompt_Symbol_Fingerprint_To_Error_Portrait_BottomRight
else -> R.raw.BiometricPrompt_Fingerprint_To_Error_Landscape
R.raw.biometricprompt_symbol_fingerprint_to_error_portrait_bottomright
else -> R.raw.biometricprompt_fingerprint_to_error_landscape
}
}
STATE_AUTHENTICATING_ANIMATING_IN,
@@ -218,25 +218,25 @@ open class AuthBiometricFingerprintIconController(
if (oldState == STATE_ERROR || oldState == STATE_HELP) {
when (rotation) {
Surface.ROTATION_0 ->
R.raw.BiometricPrompt_Symbol_Error_To_Fingerprint_Landscape
R.raw.biometricprompt_symbol_error_to_fingerprint_landscape
Surface.ROTATION_90 ->
R.raw.BiometricPrompt_Symbol_Error_To_Fingerprint_Portrait_TopLeft
R.raw.biometricprompt_symbol_error_to_fingerprint_portrait_topleft
Surface.ROTATION_180 ->
R.raw.BiometricPrompt_Symbol_Error_To_Fingerprint_Landscape
R.raw.biometricprompt_symbol_error_to_fingerprint_landscape
Surface.ROTATION_270 ->
R.raw.BiometricPrompt_Symbol_Error_To_Fingerprint_Portrait_BottomRight
else -> R.raw.BiometricPrompt_Symbol_Error_To_Fingerprint_Landscape
R.raw.biometricprompt_symbol_error_to_fingerprint_portrait_bottomright
else -> R.raw.biometricprompt_symbol_error_to_fingerprint_landscape
}
} else {
when (rotation) {
Surface.ROTATION_0 -> R.raw.BiometricPrompt_Fingerprint_To_Error_Landscape
Surface.ROTATION_0 -> R.raw.biometricprompt_fingerprint_to_error_landscape
Surface.ROTATION_90 ->
R.raw.BiometricPrompt_Symbol_Fingerprint_To_Error_Portrait_TopLeft
R.raw.biometricprompt_symbol_fingerprint_to_error_portrait_topleft
Surface.ROTATION_180 ->
R.raw.BiometricPrompt_Fingerprint_To_Error_Landscape
R.raw.biometricprompt_fingerprint_to_error_landscape
Surface.ROTATION_270 ->
R.raw.BiometricPrompt_Symbol_Fingerprint_To_Error_Portrait_BottomRight
else -> R.raw.BiometricPrompt_Fingerprint_To_Error_Landscape
R.raw.biometricprompt_symbol_fingerprint_to_error_portrait_bottomright
else -> R.raw.biometricprompt_fingerprint_to_error_landscape
}
}
}
@@ -244,26 +244,26 @@ open class AuthBiometricFingerprintIconController(
if (oldState == STATE_ERROR || oldState == STATE_HELP) {
when (rotation) {
Surface.ROTATION_0 ->
R.raw.BiometricPrompt_Symbol_Error_To_Success_Landscape
R.raw.biometricprompt_symbol_error_to_success_landscape
Surface.ROTATION_90 ->
R.raw.BiometricPrompt_Symbol_Error_To_Success_Portrait_TopLeft
R.raw.biometricprompt_symbol_error_to_success_portrait_topleft
Surface.ROTATION_180 ->
R.raw.BiometricPrompt_Symbol_Error_To_Success_Landscape
R.raw.biometricprompt_symbol_error_to_success_landscape
Surface.ROTATION_270 ->
R.raw.BiometricPrompt_Symbol_Error_To_Success_Portrait_BottomRight
else -> R.raw.BiometricPrompt_Symbol_Error_To_Success_Landscape
R.raw.biometricprompt_symbol_error_to_success_portrait_bottomright
else -> R.raw.biometricprompt_symbol_error_to_success_landscape
}
} else {
when (rotation) {
Surface.ROTATION_0 ->
R.raw.BiometricPrompt_Symbol_Fingerprint_To_Success_Landscape
R.raw.biometricprompt_symbol_fingerprint_to_success_landscape
Surface.ROTATION_90 ->
R.raw.BiometricPrompt_Symbol_Fingerprint_To_Success_Portrait_TopLeft
R.raw.biometricprompt_symbol_fingerprint_to_success_portrait_topleft
Surface.ROTATION_180 ->
R.raw.BiometricPrompt_Symbol_Fingerprint_To_Success_Landscape
R.raw.biometricprompt_symbol_fingerprint_to_success_landscape
Surface.ROTATION_270 ->
R.raw.BiometricPrompt_Symbol_Fingerprint_To_Success_Portrait_BottomRight
else -> R.raw.BiometricPrompt_Symbol_Fingerprint_To_Success_Landscape
R.raw.biometricprompt_symbol_fingerprint_to_success_portrait_bottomright
else -> R.raw.biometricprompt_symbol_fingerprint_to_success_landscape
}
}
}