From 27267d6869a4e970e7575f36d0de75e8cb663952 Mon Sep 17 00:00:00 2001 From: Jorim Jaggi Date: Tue, 28 Apr 2015 13:27:12 -0700 Subject: [PATCH] Add animation for fingerprint error state - Put lock icon logic in a separate class. - Add animation when switching between fingerprint scanning and fingerprint error. Change-Id: I87c3f101d645a990d5397b82a797c9ee40a63da2 --- ...ror_state_fingerprint_ridges_animation.xml | 50 +++++ ...gerprint_error_state_group_1_animation.xml | 36 +++ ...gerprint_error_state_group_2_animation.xml | 70 ++++++ ...ngerprint_error_state_path_3_animation.xml | 36 +++ ...t_error_state_ridge_1_path_0_animation.xml | 43 ++++ ...int_error_state_ridge_1_path_animation.xml | 36 +++ ...t_error_state_ridge_2_path_0_animation.xml | 43 ++++ ...int_error_state_ridge_2_path_animation.xml | 36 +++ ...t_error_state_ridge_5_path_0_animation.xml | 43 ++++ ...int_error_state_ridge_5_path_animation.xml | 26 +++ ...t_error_state_ridge_6_path_0_animation.xml | 43 ++++ ...int_error_state_ridge_6_path_animation.xml | 36 +++ ...t_error_state_ridge_7_path_0_animation.xml | 53 +++++ ...int_error_state_ridge_7_path_animation.xml | 36 +++ ...ate_white_fingerprint_ridges_animation.xml | 50 +++++ .../lockscreen_fingerprint_error_state.xml | 180 +++++++++++++++ ...reen_fingerprint_error_state_animation.xml | 65 ++++++ ...t_error_state_animation_interpolator_0.xml | 19 ++ ...t_error_state_animation_interpolator_1.xml | 19 ++ ...t_error_state_animation_interpolator_2.xml | 19 ++ ...t_error_state_animation_interpolator_3.xml | 19 ++ .../res/layout/keyguard_bottom_area.xml | 2 +- .../phone/KeyguardBottomAreaView.java | 130 ++--------- .../systemui/statusbar/phone/LockIcon.java | 212 ++++++++++++++++++ 24 files changed, 1184 insertions(+), 118 deletions(-) create mode 100644 packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_fingerprint_ridges_animation.xml create mode 100644 packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_group_1_animation.xml create mode 100644 packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_group_2_animation.xml create mode 100644 packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_path_3_animation.xml create mode 100644 packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_1_path_0_animation.xml create mode 100644 packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_1_path_animation.xml create mode 100644 packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_2_path_0_animation.xml create mode 100644 packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_2_path_animation.xml create mode 100644 packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_5_path_0_animation.xml create mode 100644 packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_5_path_animation.xml create mode 100644 packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_6_path_0_animation.xml create mode 100644 packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_6_path_animation.xml create mode 100644 packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_7_path_0_animation.xml create mode 100644 packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_7_path_animation.xml create mode 100644 packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_white_fingerprint_ridges_animation.xml create mode 100644 packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state.xml create mode 100644 packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state_animation.xml create mode 100644 packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_animation_interpolator_0.xml create mode 100644 packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_animation_interpolator_1.xml create mode 100644 packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_animation_interpolator_2.xml create mode 100644 packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_animation_interpolator_3.xml create mode 100644 packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_fingerprint_ridges_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_fingerprint_ridges_animation.xml new file mode 100644 index 0000000000000..c6a4622558442 --- /dev/null +++ b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_fingerprint_ridges_animation.xml @@ -0,0 +1,50 @@ + + + + + + + + + + diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_group_1_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_group_1_animation.xml new file mode 100644 index 0000000000000..0e2c2f008cb90 --- /dev/null +++ b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_group_1_animation.xml @@ -0,0 +1,36 @@ + + + + + + + + diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_group_2_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_group_2_animation.xml new file mode 100644 index 0000000000000..c01010d315fc5 --- /dev/null +++ b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_group_2_animation.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_path_3_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_path_3_animation.xml new file mode 100644 index 0000000000000..454be2455aaf4 --- /dev/null +++ b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_path_3_animation.xml @@ -0,0 +1,36 @@ + + + + + + + + diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_1_path_0_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_1_path_0_animation.xml new file mode 100644 index 0000000000000..faeecf4c825ac --- /dev/null +++ b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_1_path_0_animation.xml @@ -0,0 +1,43 @@ + + + + + + + + + diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_1_path_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_1_path_animation.xml new file mode 100644 index 0000000000000..3bacf033739b3 --- /dev/null +++ b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_1_path_animation.xml @@ -0,0 +1,36 @@ + + + + + + + + diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_2_path_0_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_2_path_0_animation.xml new file mode 100644 index 0000000000000..80a0faaa08ad4 --- /dev/null +++ b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_2_path_0_animation.xml @@ -0,0 +1,43 @@ + + + + + + + + + diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_2_path_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_2_path_animation.xml new file mode 100644 index 0000000000000..3a182968775e5 --- /dev/null +++ b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_2_path_animation.xml @@ -0,0 +1,36 @@ + + + + + + + + diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_5_path_0_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_5_path_0_animation.xml new file mode 100644 index 0000000000000..1e16df7c2ad31 --- /dev/null +++ b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_5_path_0_animation.xml @@ -0,0 +1,43 @@ + + + + + + + + + diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_5_path_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_5_path_animation.xml new file mode 100644 index 0000000000000..a1cf8df403f65 --- /dev/null +++ b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_5_path_animation.xml @@ -0,0 +1,26 @@ + + + + + diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_6_path_0_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_6_path_0_animation.xml new file mode 100644 index 0000000000000..f88c07023dd54 --- /dev/null +++ b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_6_path_0_animation.xml @@ -0,0 +1,43 @@ + + + + + + + + + diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_6_path_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_6_path_animation.xml new file mode 100644 index 0000000000000..ada7c10a1073e --- /dev/null +++ b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_6_path_animation.xml @@ -0,0 +1,36 @@ + + + + + + + + diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_7_path_0_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_7_path_0_animation.xml new file mode 100644 index 0000000000000..e6b12da6e6297 --- /dev/null +++ b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_7_path_0_animation.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_7_path_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_7_path_animation.xml new file mode 100644 index 0000000000000..8c6e71df14414 --- /dev/null +++ b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_7_path_animation.xml @@ -0,0 +1,36 @@ + + + + + + + + diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_white_fingerprint_ridges_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_white_fingerprint_ridges_animation.xml new file mode 100644 index 0000000000000..c6a4622558442 --- /dev/null +++ b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_white_fingerprint_ridges_animation.xml @@ -0,0 +1,50 @@ + + + + + + + + + + diff --git a/packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state.xml b/packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state.xml new file mode 100644 index 0000000000000..cc8aba99116a6 --- /dev/null +++ b/packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state.xml @@ -0,0 +1,180 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state_animation.xml b/packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state_animation.xml new file mode 100644 index 0000000000000..8cc8ac2172a27 --- /dev/null +++ b/packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state_animation.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + diff --git a/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_animation_interpolator_0.xml b/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_animation_interpolator_0.xml new file mode 100644 index 0000000000000..39c5211fe4f03 --- /dev/null +++ b/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_animation_interpolator_0.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_animation_interpolator_1.xml b/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_animation_interpolator_1.xml new file mode 100644 index 0000000000000..d3ae9d74ec064 --- /dev/null +++ b/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_animation_interpolator_1.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_animation_interpolator_2.xml b/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_animation_interpolator_2.xml new file mode 100644 index 0000000000000..e10db01ac697f --- /dev/null +++ b/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_animation_interpolator_2.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_animation_interpolator_3.xml b/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_animation_interpolator_3.xml new file mode 100644 index 0000000000000..736eac68f9ca8 --- /dev/null +++ b/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_animation_interpolator_3.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml index fca82318aea43..105746476b2a5 100644 --- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml +++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml @@ -61,7 +61,7 @@ android:scaleType="center" android:contentDescription="@string/accessibility_phone_button" /> -