diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_bottompath_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_bottompath_animation.xml new file mode 100644 index 0000000000000..073bf6d194a60 --- /dev/null +++ b/packages/SystemUI/res/anim/error_to_trustedstate_bottompath_animation.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/packages/SystemUI/res/anim/ic_volume_expand_chevron_01_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_circlepath_animation.xml similarity index 65% rename from packages/SystemUI/res/anim/ic_volume_expand_chevron_01_animation.xml rename to packages/SystemUI/res/anim/error_to_trustedstate_circlepath_animation.xml index e43e6453d82d6..990392d28e26b 100644 --- a/packages/SystemUI/res/anim/ic_volume_expand_chevron_01_animation.xml +++ b/packages/SystemUI/res/anim/error_to_trustedstate_circlepath_animation.xml @@ -1,5 +1,5 @@ - - - + - - \ No newline at end of file + android:duration="383" + android:propertyName="trimPathEnd" + android:valueFrom="1.0" + android:valueTo="0.0" + android:valueType="floatType" + android:interpolator="@android:interpolator/fast_out_slow_in" /> + diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_ellipse_path_1_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_ellipse_path_1_animation.xml old mode 100755 new mode 100644 index 1c501658a2eb5..a00d93746b9a8 --- a/packages/SystemUI/res/anim/error_to_trustedstate_ellipse_path_1_animation.xml +++ b/packages/SystemUI/res/anim/error_to_trustedstate_ellipse_path_1_animation.xml @@ -1,46 +1,35 @@ - - - - - + + + + diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_ellipse_path_2_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_ellipse_path_2_animation.xml deleted file mode 100755 index 598255cb8397d..0000000000000 --- a/packages/SystemUI/res/anim/error_to_trustedstate_ellipse_path_2_animation.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_errorcircle_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_errorcircle_animation.xml new file mode 100644 index 0000000000000..59d6232327574 --- /dev/null +++ b/packages/SystemUI/res/anim/error_to_trustedstate_errorcircle_animation.xml @@ -0,0 +1,35 @@ + + + + + + + + diff --git a/packages/SystemUI/res/anim/ic_volume_collapse_rectangle_2_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_errorexclamationdot_animation.xml similarity index 56% rename from packages/SystemUI/res/anim/ic_volume_collapse_rectangle_2_animation.xml rename to packages/SystemUI/res/anim/error_to_trustedstate_errorexclamationdot_animation.xml index 0bc66bd713218..55bfa58c5184d 100644 --- a/packages/SystemUI/res/anim/ic_volume_collapse_rectangle_2_animation.xml +++ b/packages/SystemUI/res/anim/error_to_trustedstate_errorexclamationdot_animation.xml @@ -1,5 +1,5 @@ - - - + - - \ No newline at end of file + android:duration="283" + android:propertyXName="translateX" + android:propertyYName="translateY" + android:pathData="M 12.0,12.0 c 0.0,-0.66667 0.0,-3.33333 0.0,-4.0" + android:interpolator="@interpolator/error_to_trustedstate_animation_interpolator_5" /> + diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_exclamation_dot_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_exclamation_dot_animation.xml deleted file mode 100755 index 7e0fa437f7195..0000000000000 --- a/packages/SystemUI/res/anim/error_to_trustedstate_exclamation_dot_animation.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - diff --git a/packages/SystemUI/res/anim/ic_volume_collapse_chevron_02_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_exclamationtop_animation.xml similarity index 61% rename from packages/SystemUI/res/anim/ic_volume_collapse_chevron_02_animation.xml rename to packages/SystemUI/res/anim/error_to_trustedstate_exclamationtop_animation.xml index 443f2a651e59a..4c44c6bd5eeb3 100644 --- a/packages/SystemUI/res/anim/ic_volume_collapse_chevron_02_animation.xml +++ b/packages/SystemUI/res/anim/error_to_trustedstate_exclamationtop_animation.xml @@ -1,5 +1,5 @@ - - - + - - \ No newline at end of file + android:propertyYName="translateY" + android:pathData="M 0.0,-2.0 c 0.0,0.5 0.0,2.5 0.0,3.0" + android:interpolator="@interpolator/error_to_trustedstate_animation_interpolator_2" /> + diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_lock_left_side_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_lock_left_side_animation.xml deleted file mode 100755 index f413cbf87c304..0000000000000 --- a/packages/SystemUI/res/anim/error_to_trustedstate_lock_left_side_animation.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_lock_right_side_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_lock_right_side_animation.xml deleted file mode 100755 index f413cbf87c304..0000000000000 --- a/packages/SystemUI/res/anim/error_to_trustedstate_lock_right_side_animation.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_lock_top_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_lock_top_animation.xml old mode 100755 new mode 100644 index 2518041f3c1ac..6f7d692e86c00 --- a/packages/SystemUI/res/anim/error_to_trustedstate_lock_top_animation.xml +++ b/packages/SystemUI/res/anim/error_to_trustedstate_lock_top_animation.xml @@ -1,32 +1,31 @@ - - - + android:interpolator="@interpolator/error_to_trustedstate_animation_interpolator_3" /> + + + + - - diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_path_2_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_path_2_animation.xml old mode 100755 new mode 100644 index aa81fcff0da5d..fac1ece2dadd0 --- a/packages/SystemUI/res/anim/error_to_trustedstate_path_2_animation.xml +++ b/packages/SystemUI/res/anim/error_to_trustedstate_path_2_animation.xml @@ -1,56 +1,52 @@ - - + android:interpolator="@interpolator/error_to_trustedstate_animation_interpolator_3" /> + + + + - - diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_path_3_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_path_3_animation.xml old mode 100755 new mode 100644 index f94fe0a96974e..c1ece081e2933 --- a/packages/SystemUI/res/anim/error_to_trustedstate_path_3_animation.xml +++ b/packages/SystemUI/res/anim/error_to_trustedstate_path_3_animation.xml @@ -1,49 +1,35 @@ - + android:interpolator="@interpolator/error_to_trustedstate_animation_interpolator_4" /> - - diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_toppath_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_toppath_animation.xml new file mode 100644 index 0000000000000..d9781dfdba3a3 --- /dev/null +++ b/packages/SystemUI/res/anim/error_to_trustedstate_toppath_animation.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + diff --git a/packages/SystemUI/res/anim/ic_bluetooth_transient_dot_left_animation.xml b/packages/SystemUI/res/anim/ic_bluetooth_transient_dot_left_animation.xml new file mode 100644 index 0000000000000..b5dd5c359a9e6 --- /dev/null +++ b/packages/SystemUI/res/anim/ic_bluetooth_transient_dot_left_animation.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + diff --git a/packages/SystemUI/res/anim/ic_bluetooth_transient_dot_right_animation.xml b/packages/SystemUI/res/anim/ic_bluetooth_transient_dot_right_animation.xml new file mode 100644 index 0000000000000..14704bf3da5d3 --- /dev/null +++ b/packages/SystemUI/res/anim/ic_bluetooth_transient_dot_right_animation.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + diff --git a/packages/SystemUI/res/anim/ic_bluetooth_transient_group_1_animation.xml b/packages/SystemUI/res/anim/ic_bluetooth_transient_group_1_animation.xml deleted file mode 100644 index 26c6aa706cbf0..0000000000000 --- a/packages/SystemUI/res/anim/ic_bluetooth_transient_group_1_animation.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - diff --git a/packages/SystemUI/res/anim/ic_bluetooth_transient_group_2_animation.xml b/packages/SystemUI/res/anim/ic_bluetooth_transient_group_2_animation.xml deleted file mode 100644 index e1f8989b9a217..0000000000000 --- a/packages/SystemUI/res/anim/ic_bluetooth_transient_group_2_animation.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - diff --git a/packages/SystemUI/res/anim/ic_volume_expand_rectangle_4_animation.xml b/packages/SystemUI/res/anim/ic_caret_down_left_animation.xml similarity index 55% rename from packages/SystemUI/res/anim/ic_volume_expand_rectangle_4_animation.xml rename to packages/SystemUI/res/anim/ic_caret_down_left_animation.xml index 6ae0fefa9bef9..d465f198a679d 100644 --- a/packages/SystemUI/res/anim/ic_volume_expand_rectangle_4_animation.xml +++ b/packages/SystemUI/res/anim/ic_caret_down_left_animation.xml @@ -1,5 +1,6 @@ + - - + + - - \ No newline at end of file + android:valueType="floatType" + android:interpolator="@interpolator/ic_caret_down_animation_interpolator_0" /> + diff --git a/packages/SystemUI/res/anim/ic_volume_expand_rectangle_3_animation.xml b/packages/SystemUI/res/anim/ic_caret_down_right_animation.xml similarity index 55% rename from packages/SystemUI/res/anim/ic_volume_expand_rectangle_3_animation.xml rename to packages/SystemUI/res/anim/ic_caret_down_right_animation.xml index 9b575d856c775..7a38ac323242e 100644 --- a/packages/SystemUI/res/anim/ic_volume_expand_rectangle_3_animation.xml +++ b/packages/SystemUI/res/anim/ic_caret_down_right_animation.xml @@ -1,5 +1,6 @@ + - - + + - - \ No newline at end of file + android:valueType="floatType" + android:interpolator="@interpolator/ic_caret_down_animation_interpolator_0" /> + diff --git a/packages/SystemUI/res/anim/ic_caret_up_left_animation.xml b/packages/SystemUI/res/anim/ic_caret_up_left_animation.xml new file mode 100644 index 0000000000000..125a6164bfd1f --- /dev/null +++ b/packages/SystemUI/res/anim/ic_caret_up_left_animation.xml @@ -0,0 +1,32 @@ + + + + + + diff --git a/packages/SystemUI/res/anim/ic_caret_up_right_animation.xml b/packages/SystemUI/res/anim/ic_caret_up_right_animation.xml new file mode 100644 index 0000000000000..3fd4df58f51c4 --- /dev/null +++ b/packages/SystemUI/res/anim/ic_caret_up_right_animation.xml @@ -0,0 +1,32 @@ + + + + + + diff --git a/packages/SystemUI/res/anim/ic_fingerprint_toerror_bottompath_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_bottompath_animation.xml new file mode 100644 index 0000000000000..91829c020f66c --- /dev/null +++ b/packages/SystemUI/res/anim/ic_fingerprint_toerror_bottompath_animation.xml @@ -0,0 +1,35 @@ + + + + + + + + diff --git a/packages/SystemUI/res/anim/ic_fingerprint_toerror_circlepath_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_circlepath_animation.xml new file mode 100644 index 0000000000000..9b08fa26b4ad1 --- /dev/null +++ b/packages/SystemUI/res/anim/ic_fingerprint_toerror_circlepath_animation.xml @@ -0,0 +1,35 @@ + + + + + + + + diff --git a/packages/SystemUI/res/anim/ic_fingerprint_toerror_errorcircle_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_errorcircle_animation.xml new file mode 100644 index 0000000000000..1ea2100eacdbe --- /dev/null +++ b/packages/SystemUI/res/anim/ic_fingerprint_toerror_errorcircle_animation.xml @@ -0,0 +1,35 @@ + + + + + + + + diff --git a/packages/SystemUI/res/anim/ic_fingerprint_toerror_errorexclamation_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_errorexclamation_animation.xml new file mode 100644 index 0000000000000..0b9cb95ee35e3 --- /dev/null +++ b/packages/SystemUI/res/anim/ic_fingerprint_toerror_errorexclamation_animation.xml @@ -0,0 +1,35 @@ + + + + + + + + diff --git a/packages/SystemUI/res/interpolator/ic_volume_collapse_animation_interpolator_0.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_exclamationbottom_animation.xml similarity index 73% rename from packages/SystemUI/res/interpolator/ic_volume_collapse_animation_interpolator_0.xml rename to packages/SystemUI/res/anim/ic_fingerprint_toerror_exclamationbottom_animation.xml index c3930e42cdaab..c597b821eeaca 100644 --- a/packages/SystemUI/res/interpolator/ic_volume_collapse_animation_interpolator_0.xml +++ b/packages/SystemUI/res/anim/ic_fingerprint_toerror_exclamationbottom_animation.xml @@ -1,5 +1,5 @@ - - + diff --git a/packages/SystemUI/res/anim/ic_volume_collapse_rectangle_1_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_exclamationtop_animation.xml similarity index 56% rename from packages/SystemUI/res/anim/ic_volume_collapse_rectangle_1_animation.xml rename to packages/SystemUI/res/anim/ic_fingerprint_toerror_exclamationtop_animation.xml index d82f6706a633d..bde83de1636bd 100644 --- a/packages/SystemUI/res/anim/ic_volume_collapse_rectangle_1_animation.xml +++ b/packages/SystemUI/res/anim/ic_fingerprint_toerror_exclamationtop_animation.xml @@ -1,5 +1,5 @@ - - - + - - \ No newline at end of file + android:duration="700" + android:propertyXName="translateX" + android:propertyYName="translateY" + android:pathData="M 0.0,0.0 c 0.0,-0.33333 0.0,-1.66667 0.0,-2.0" + android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_3" /> + diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_fingerprint_ridges_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_fingerprinterror_animation.xml similarity index 51% rename from packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_fingerprint_ridges_animation.xml rename to packages/SystemUI/res/anim/ic_fingerprint_toerror_fingerprinterror_animation.xml index ada4213512748..a3afaef50b406 100644 --- a/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_fingerprint_ridges_animation.xml +++ b/packages/SystemUI/res/anim/ic_fingerprint_toerror_fingerprinterror_animation.xml @@ -1,4 +1,19 @@ + + android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_2" /> + android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_0" /> + android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_0" /> diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_white_fingerprint_ridges_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_fingerprintwhite_animation.xml similarity index 51% rename from packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_white_fingerprint_ridges_animation.xml rename to packages/SystemUI/res/anim/ic_fingerprint_toerror_fingerprintwhite_animation.xml index ada4213512748..a3afaef50b406 100644 --- a/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_white_fingerprint_ridges_animation.xml +++ b/packages/SystemUI/res/anim/ic_fingerprint_toerror_fingerprintwhite_animation.xml @@ -1,4 +1,19 @@ + + android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_2" /> + android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_0" /> + android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_0" /> diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_ridge_1_path_0_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_1_path_0_animation.xml similarity index 56% rename from packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_ridge_1_path_0_animation.xml rename to packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_1_path_0_animation.xml index 26622dd6b165f..1c3a766f7a3c5 100644 --- a/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_ridge_1_path_0_animation.xml +++ b/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_1_path_0_animation.xml @@ -1,4 +1,19 @@ + + android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_1" /> diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_ridge_1_path_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_1_path_animation.xml similarity index 57% rename from packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_ridge_1_path_animation.xml rename to packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_1_path_animation.xml index 443e6fb0ec72b..5a9258a29534d 100644 --- a/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_ridge_1_path_animation.xml +++ b/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_1_path_animation.xml @@ -1,20 +1,19 @@ +Copyright (C) 2017 The Android Open Source Project + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + + android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_2" /> + android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_2" /> diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_ridge_2_path_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_2_path_animation.xml similarity index 54% rename from packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_ridge_2_path_animation.xml rename to packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_2_path_animation.xml index f8140d5c4aeaf..c69001ce8ee1a 100644 --- a/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_ridge_2_path_animation.xml +++ b/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_2_path_animation.xml @@ -1,4 +1,19 @@ + + + android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_1" /> diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_rectangle_path_1_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_5_path_animation.xml old mode 100755 new mode 100644 similarity index 56% rename from packages/SystemUI/res/anim/trusted_state_to_error_rectangle_path_1_animation.xml rename to packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_5_path_animation.xml index 46d571cac76d9..8e9a05101598b --- a/packages/SystemUI/res/anim/trusted_state_to_error_rectangle_path_1_animation.xml +++ b/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_5_path_animation.xml @@ -1,8 +1,8 @@ + + + + + + + diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_ridge_6_path_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_6_path_animation.xml similarity index 54% rename from packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_ridge_6_path_animation.xml rename to packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_6_path_animation.xml index ad37bc1407b78..3584f91ba86c5 100644 --- a/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_ridge_6_path_animation.xml +++ b/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_6_path_animation.xml @@ -1,4 +1,19 @@ + + + android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_1" /> diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_ridge_7_path_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_7_path_animation.xml similarity index 54% rename from packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_ridge_7_path_animation.xml rename to packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_7_path_animation.xml index a09bdea363393..52a5b3e2c6153 100644 --- a/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_ridge_7_path_animation.xml +++ b/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_7_path_animation.xml @@ -1,4 +1,19 @@ + + + + + + + + diff --git a/packages/SystemUI/res/anim/ic_fingerprint_tofp_bottompath_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_tofp_bottompath_animation.xml new file mode 100644 index 0000000000000..4bc18f24a3af2 --- /dev/null +++ b/packages/SystemUI/res/anim/ic_fingerprint_tofp_bottompath_animation.xml @@ -0,0 +1,36 @@ + + + + + + + + diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_rectangle_path_1_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_tofp_circlepath_animation.xml old mode 100755 new mode 100644 similarity index 57% rename from packages/SystemUI/res/anim/error_to_trustedstate_rectangle_path_1_animation.xml rename to packages/SystemUI/res/anim/ic_fingerprint_tofp_circlepath_animation.xml index bcc8c41774263..9273b9adc20d8 --- a/packages/SystemUI/res/anim/error_to_trustedstate_rectangle_path_1_animation.xml +++ b/packages/SystemUI/res/anim/ic_fingerprint_tofp_circlepath_animation.xml @@ -1,8 +1,8 @@ + + + + + + diff --git a/packages/SystemUI/res/anim/ic_fingerprint_tofp_errorexclamation_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_tofp_errorexclamation_animation.xml new file mode 100644 index 0000000000000..5d4b268ed2393 --- /dev/null +++ b/packages/SystemUI/res/anim/ic_fingerprint_tofp_errorexclamation_animation.xml @@ -0,0 +1,36 @@ + + + + + + + + diff --git a/packages/SystemUI/res/anim/ic_fingerprint_tofp_exclamationbottom_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_tofp_exclamationbottom_animation.xml new file mode 100644 index 0000000000000..d3d7d1c47bdcd --- /dev/null +++ b/packages/SystemUI/res/anim/ic_fingerprint_tofp_exclamationbottom_animation.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/packages/SystemUI/res/anim/ic_fingerprint_tofp_exclamationtop_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_tofp_exclamationtop_animation.xml new file mode 100644 index 0000000000000..04b6868e5a5b8 --- /dev/null +++ b/packages/SystemUI/res/anim/ic_fingerprint_tofp_exclamationtop_animation.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/packages/SystemUI/res/anim/ic_fingerprint_tofp_fingerprintwhite_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_tofp_fingerprintwhite_animation.xml new file mode 100644 index 0000000000000..25f2c43a92c1d --- /dev/null +++ b/packages/SystemUI/res/anim/ic_fingerprint_tofp_fingerprintwhite_animation.xml @@ -0,0 +1,36 @@ + + + + + + + + diff --git a/packages/SystemUI/res/anim/ic_fingerprint_tofp_ridge_1_path_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_tofp_ridge_1_path_animation.xml new file mode 100644 index 0000000000000..4a6f39a6f0a0f --- /dev/null +++ b/packages/SystemUI/res/anim/ic_fingerprint_tofp_ridge_1_path_animation.xml @@ -0,0 +1,36 @@ + + + + + + + + diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_path_3_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_tofp_ridge_2_path_animation.xml similarity index 53% rename from packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_path_3_animation.xml rename to packages/SystemUI/res/anim/ic_fingerprint_tofp_ridge_2_path_animation.xml index ec658051a9f57..c9a9f64efcbd3 100644 --- a/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_path_3_animation.xml +++ b/packages/SystemUI/res/anim/ic_fingerprint_tofp_ridge_2_path_animation.xml @@ -1,33 +1,32 @@ +Copyright (C) 2017 The Android Open Source Project + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + + + + + + + diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_lock_left_side_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_tofp_ridge_6_path_animation.xml old mode 100755 new mode 100644 similarity index 52% rename from packages/SystemUI/res/anim/trusted_state_to_error_lock_left_side_animation.xml rename to packages/SystemUI/res/anim/ic_fingerprint_tofp_ridge_6_path_animation.xml index 2a4753a2287ac..04a6036966bb0 --- a/packages/SystemUI/res/anim/trusted_state_to_error_lock_left_side_animation.xml +++ b/packages/SystemUI/res/anim/ic_fingerprint_tofp_ridge_6_path_animation.xml @@ -1,8 +1,8 @@ + + + + + + diff --git a/packages/SystemUI/res/anim/ic_fingerprint_tofp_toppath_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_tofp_toppath_animation.xml new file mode 100644 index 0000000000000..9b3498ffa585e --- /dev/null +++ b/packages/SystemUI/res/anim/ic_fingerprint_tofp_toppath_animation.xml @@ -0,0 +1,36 @@ + + + + + + + + diff --git a/packages/SystemUI/res/anim/ic_hotspot_transient_circle_1_animation.xml b/packages/SystemUI/res/anim/ic_hotspot_transient_circle_1_animation.xml index 3444747f3a245..5e71847006142 100644 --- a/packages/SystemUI/res/anim/ic_hotspot_transient_circle_1_animation.xml +++ b/packages/SystemUI/res/anim/ic_hotspot_transient_circle_1_animation.xml @@ -1,15 +1,23 @@ + - + + + - - - - - diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_group_2_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_group_2_animation.xml deleted file mode 100644 index 0ff1c8c7bb281..0000000000000 --- a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_group_2_animation.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_path_1_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_path_1_animation.xml deleted file mode 100644 index a1cadf8eae6bf..0000000000000 --- a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_path_1_animation.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_path_2_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_path_2_animation.xml deleted file mode 100644 index 1ca49ba78dc36..0000000000000 --- a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_path_2_animation.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_path_3_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_path_3_animation.xml deleted file mode 100644 index 84917477a5616..0000000000000 --- a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_path_3_animation.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_ridge_1_path_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_ridge_1_path_animation.xml deleted file mode 100644 index b9636ae86af2c..0000000000000 --- a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_ridge_1_path_animation.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_ridge_2_path_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_ridge_2_path_animation.xml deleted file mode 100644 index c1a3ecfb6fb0d..0000000000000 --- a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_ridge_2_path_animation.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_ridge_5_path_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_ridge_5_path_animation.xml deleted file mode 100644 index e285edce5ed54..0000000000000 --- a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_ridge_5_path_animation.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_ridge_6_path_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_ridge_6_path_animation.xml deleted file mode 100644 index 2ea102109c025..0000000000000 --- a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_ridge_6_path_animation.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_ridge_7_path_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_ridge_7_path_animation.xml deleted file mode 100644 index 1481cfa3a1a78..0000000000000 --- a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_ridge_7_path_animation.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_white_fingerprint_ridges_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_white_fingerprint_ridges_animation.xml deleted file mode 100644 index 9dc587cb10ecc..0000000000000 --- a/packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_to_fp_white_fingerprint_ridges_animation.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_group_1_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_group_1_animation.xml deleted file mode 100644 index 2cdd02c1b4c87..0000000000000 --- a/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_group_1_animation.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_group_2_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_group_2_animation.xml deleted file mode 100644 index 7b62f207784f8..0000000000000 --- a/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_group_2_animation.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_path_1_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_path_1_animation.xml deleted file mode 100644 index bdd24b762e385..0000000000000 --- a/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_path_1_animation.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_path_2_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_path_2_animation.xml deleted file mode 100644 index 8ec7c30e94969..0000000000000 --- a/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_path_2_animation.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_ridge_5_path_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_ridge_5_path_animation.xml deleted file mode 100644 index eef1efdd28412..0000000000000 --- a/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_ridge_5_path_animation.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_ridge_6_path_0_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_ridge_6_path_0_animation.xml deleted file mode 100644 index 1b8a77f491187..0000000000000 --- a/packages/SystemUI/res/anim/lockscreen_fingerprint_fp_to_error_state_ridge_6_path_0_animation.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_bottompath_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_bottompath_animation.xml new file mode 100644 index 0000000000000..7a01896c67892 --- /dev/null +++ b/packages/SystemUI/res/anim/trusted_state_to_error_bottompath_animation.xml @@ -0,0 +1,36 @@ + + + + + + + + diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_lock_right_side_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_circlepath_animation.xml old mode 100755 new mode 100644 similarity index 52% rename from packages/SystemUI/res/anim/trusted_state_to_error_lock_right_side_animation.xml rename to packages/SystemUI/res/anim/trusted_state_to_error_circlepath_animation.xml index 2a4753a2287ac..ac5e44894539c --- a/packages/SystemUI/res/anim/trusted_state_to_error_lock_right_side_animation.xml +++ b/packages/SystemUI/res/anim/trusted_state_to_error_circlepath_animation.xml @@ -1,8 +1,8 @@ - - - - - - - - - + android:duration="200" + android:propertyName="pathData" + android:valueFrom="M 0.0,-1.988645 c 1.09829830627,0.0 1.988645,0.890346693734 1.988645,1.988645 c 0.0,1.09829830627 -0.890346693734,1.988645 -1.988645,1.988645 c -1.09829830627,0.0 -1.988645,-0.890346693734 -1.988645,-1.988645 c 0.0,-1.09829830627 0.890346693734,-1.988645 1.988645,-1.988645 Z" + android:valueTo="M 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z" + android:valueType="pathType" + android:interpolator="@interpolator/trusted_state_to_error_animation_interpolator_0" /> diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_ellipse_path_2_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_ellipse_path_2_animation.xml deleted file mode 100755 index a387f97730d06..0000000000000 --- a/packages/SystemUI/res/anim/trusted_state_to_error_ellipse_path_2_animation.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_errorcircle_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_errorcircle_animation.xml new file mode 100644 index 0000000000000..903d97e0f2f8b --- /dev/null +++ b/packages/SystemUI/res/anim/trusted_state_to_error_errorcircle_animation.xml @@ -0,0 +1,36 @@ + + + + + + + + diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_errorexclamationdot_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_errorexclamationdot_animation.xml new file mode 100644 index 0000000000000..c5339a0b11a00 --- /dev/null +++ b/packages/SystemUI/res/anim/trusted_state_to_error_errorexclamationdot_animation.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_exclamation_dot_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_exclamation_dot_animation.xml deleted file mode 100755 index 7a9fb3b3372da..0000000000000 --- a/packages/SystemUI/res/anim/trusted_state_to_error_exclamation_dot_animation.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_exclamationtop_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_exclamationtop_animation.xml new file mode 100644 index 0000000000000..c5b2c126bef16 --- /dev/null +++ b/packages/SystemUI/res/anim/trusted_state_to_error_exclamationtop_animation.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_lock_top_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_lock_top_animation.xml old mode 100755 new mode 100644 index 1f601d34d9f75..63a25d9a8da5e --- a/packages/SystemUI/res/anim/trusted_state_to_error_lock_top_animation.xml +++ b/packages/SystemUI/res/anim/trusted_state_to_error_lock_top_animation.xml @@ -1,25 +1,24 @@ - - - + android:interpolator="@interpolator/trusted_state_to_error_animation_interpolator_0" /> + android:interpolator="@interpolator/trusted_state_to_error_animation_interpolator_5" /> + + + + - - diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_path_2_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_path_2_animation.xml old mode 100755 new mode 100644 index 8eb0c62da690a..c4d38e00dc9e5 --- a/packages/SystemUI/res/anim/trusted_state_to_error_path_2_animation.xml +++ b/packages/SystemUI/res/anim/trusted_state_to_error_path_2_animation.xml @@ -1,56 +1,52 @@ - - + android:interpolator="@interpolator/trusted_state_to_error_animation_interpolator_0" /> + android:interpolator="@interpolator/trusted_state_to_error_animation_interpolator_5" /> + + + + - - diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_path_3_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_path_3_animation.xml old mode 100755 new mode 100644 index 2e867449b2f3c..455d0b89be15b --- a/packages/SystemUI/res/anim/trusted_state_to_error_path_3_animation.xml +++ b/packages/SystemUI/res/anim/trusted_state_to_error_path_3_animation.xml @@ -1,39 +1,35 @@ - - - - + + + + diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_toppath_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_toppath_animation.xml new file mode 100644 index 0000000000000..b2944e5debe41 --- /dev/null +++ b/packages/SystemUI/res/anim/trusted_state_to_error_toppath_animation.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + diff --git a/packages/SystemUI/res/drawable/error_to_trustedstate.xml b/packages/SystemUI/res/drawable/error_to_trustedstate.xml index 6211edf2a9de1..8bfe5f4a5bd14 100755 --- a/packages/SystemUI/res/drawable/error_to_trustedstate.xml +++ b/packages/SystemUI/res/drawable/error_to_trustedstate.xml @@ -1,8 +1,8 @@ + android:name="ic_bluetooth_transient_0" + android:translateX="23.99883" + android:translateY="23.99839" > + android:name="ic_bluetooth_transient_pivot" + android:translateX="-23.99883" + android:translateY="-23.99839" > + android:name="ic_bluetooth_white_outlines" + android:translateX="22.73986" + android:translateY="23.99839" > - - - - - - + android:name="ic_bluetooth_white_outlines_pivot" + android:translateX="-12.84937" + android:translateY="-20.4772" > + + android:name="dot_left_outlines" + android:translateX="20.6501" + android:translateY="24.00011" > - - - - - + android:name="dot_left_outlines_pivot" + android:translateX="-14.2" + android:translateY="-3.55" > + + android:name="dot_right_outlines" + android:translateX="27.3501" + android:translateY="23.99741" > - - - - - + android:name="dot_right_outlines_pivot" + android:translateX="7.1" + android:translateY="-3.5525" > + diff --git a/packages/SystemUI/res/drawable/ic_bluetooth_transient_animation.xml b/packages/SystemUI/res/drawable/ic_bluetooth_transient_animation.xml index f7eb23c1c89d2..dc3c3e24c68a1 100644 --- a/packages/SystemUI/res/drawable/ic_bluetooth_transient_animation.xml +++ b/packages/SystemUI/res/drawable/ic_bluetooth_transient_animation.xml @@ -1,11 +1,25 @@ + + android:name="dot_left" + android:animation="@anim/ic_bluetooth_transient_dot_left_animation" /> + android:name="dot_right" + android:animation="@anim/ic_bluetooth_transient_dot_right_animation" /> diff --git a/packages/SystemUI/res/drawable/ic_hotspot_transient.xml b/packages/SystemUI/res/drawable/ic_hotspot_transient.xml index 8c1f7ea79c44d..22f72675ffc00 100644 --- a/packages/SystemUI/res/drawable/ic_hotspot_transient.xml +++ b/packages/SystemUI/res/drawable/ic_hotspot_transient.xml @@ -1,4 +1,19 @@ + + android:name="ic_hotspot_transient_0" + android:translateX="24.00209" + android:translateY="24.2354" > + android:name="ic_hotspot_transient_pivot" + android:translateX="-24.00209" + android:translateY="-24.2354" > + android:name="circle01" + android:translateX="24.0002" + android:translateY="25.9996" > - - - - - - - - - + android:name="circle01_pivot" + android:translateX="-24.0002" + android:translateY="-25.9996" > + + + + + + + + + + + diff --git a/packages/SystemUI/res/drawable/ic_hotspot_transient_animation.xml b/packages/SystemUI/res/drawable/ic_hotspot_transient_animation.xml index b2945f187595d..929a941164a60 100644 --- a/packages/SystemUI/res/drawable/ic_hotspot_transient_animation.xml +++ b/packages/SystemUI/res/drawable/ic_hotspot_transient_animation.xml @@ -1,14 +1,29 @@ + + android:name="circle01_0" + android:animation="@anim/ic_hotspot_transient_circle_1_animation" /> + android:name="circle03_0" + android:animation="@anim/ic_hotspot_transient_circle_3_animation" /> diff --git a/packages/SystemUI/res/drawable/ic_volume_collapse.xml b/packages/SystemUI/res/drawable/ic_volume_collapse.xml index 0f488a4f61129..3853d121ce2ca 100644 --- a/packages/SystemUI/res/drawable/ic_volume_collapse.xml +++ b/packages/SystemUI/res/drawable/ic_volume_collapse.xml @@ -1,5 +1,5 @@ - - + android:name="caret___4" > + android:name="right" + android:translateX="11.287" + android:translateY="8.701" + android:rotation="45" > - - - + android:name="right_pivot" + android:translateX="4.242" > + + android:name="left" + android:translateX="12.699" + android:translateY="8.701" + android:rotation="-45" > - - - + android:name="left_pivot" + android:translateX="-4.242" > + - - \ No newline at end of file + diff --git a/packages/SystemUI/res/drawable/ic_volume_collapse_animation.xml b/packages/SystemUI/res/drawable/ic_volume_collapse_animation.xml index 5c482bc54dbc5..18c6307b9ad90 100644 --- a/packages/SystemUI/res/drawable/ic_volume_collapse_animation.xml +++ b/packages/SystemUI/res/drawable/ic_volume_collapse_animation.xml @@ -1,5 +1,5 @@ - - + android:name="right" + android:animation="@anim/ic_caret_down_right_animation" /> - - - \ No newline at end of file + android:name="left" + android:animation="@anim/ic_caret_down_left_animation" /> + diff --git a/packages/SystemUI/res/drawable/ic_volume_expand.xml b/packages/SystemUI/res/drawable/ic_volume_expand.xml index 70ff1f3c4ee34..79ff80806438a 100644 --- a/packages/SystemUI/res/drawable/ic_volume_expand.xml +++ b/packages/SystemUI/res/drawable/ic_volume_expand.xml @@ -1,5 +1,5 @@ - - + android:name="caret___4" > + android:name="right" + android:translateX="11.287" + android:translateY="15.287" + android:rotation="-45" > - - - + android:name="right_pivot" + android:translateX="4.242" > + + android:name="left" + android:translateX="12.699" + android:translateY="15.287" + android:rotation="45" > - - - + android:name="left_pivot" + android:translateX="-4.242" > + - - \ No newline at end of file + diff --git a/packages/SystemUI/res/drawable/ic_volume_expand_animation.xml b/packages/SystemUI/res/drawable/ic_volume_expand_animation.xml index ae2d7e4148154..abd6678e335f2 100644 --- a/packages/SystemUI/res/drawable/ic_volume_expand_animation.xml +++ b/packages/SystemUI/res/drawable/ic_volume_expand_animation.xml @@ -1,5 +1,5 @@ - - + android:name="right" + android:animation="@anim/ic_caret_up_right_animation" /> - - - \ No newline at end of file + android:name="left" + android:animation="@anim/ic_caret_up_left_animation" /> + diff --git a/packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state_to_fp.xml b/packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state_to_fp.xml index 3af2f7fbbc3f0..f2eca8ced896e 100644 --- a/packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state_to_fp.xml +++ b/packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state_to_fp.xml @@ -1,6 +1,6 @@ + android:viewportHeight="24" > + android:name="fingerprintwhite" + android:translateX="12" + android:translateY="12.4" + android:scaleX="0.738" + android:scaleY="0.738" + android:rotation="180" > + android:name="fingerprintwhite_pivot" + android:translateX="33" + android:translateY="34" > @@ -47,10 +48,9 @@ android:name="ridge_7_path" android:pathData="M -36.1409912109,-21.7843475342 c -1.00540161133,-1.19300842285 -1.57499694824,-1.9181060791 -2.36520385742,-3.50170898438 c -0.827560424805,-1.65869140625 -1.31352233887,-3.49159240723 -1.31352233887,-5.48489379883 c 0.0,-3.66279602051 2.96932983398,-6.63220214844 6.63221740723,-6.63220214844 c 3.6628112793,0.0 6.63220214844,2.96940612793 6.63220214844,6.63220214844" android:strokeColor="#FFFFFFFF" - android:strokeAlpha="0.5" android:strokeWidth="1.45" android:strokeLineCap="round" - android:trimPathStart="1" /> + android:trimPathEnd="0" /> @@ -58,7 +58,6 @@ android:name="ridge_6_path" android:pathData="M -42.1907958984,-25.6756896973 c -0.758117675781,-2.14370727539 -0.896545410156,-3.86891174316 -0.896545410156,-5.12921142578 c 0.0,-1.46069335938 0.249176025391,-2.84799194336 0.814682006836,-4.09748840332 c 1.56153869629,-3.45030212402 5.03434753418,-5.85076904297 9.0679473877,-5.85076904297 c 5.49430847168,0.0 9.94830322266,4.4539642334 9.94830322266,9.94825744629 c 0.0,1.83151245117 -1.48460388184,3.31610107422 -3.31610107422,3.31610107422 c -1.83149719238,0.0 -3.31610107422,-1.48469543457 -3.31610107422,-3.31610107422 c 0.0,-1.83139038086 -1.48458862305,-3.31610107422 -3.31610107422,-3.31610107422 c -1.83149719238,0.0 -3.31610107422,1.48471069336 -3.31610107422,3.31610107422 c 0.0,2.57020568848 0.989517211914,4.88710021973 2.60510253906,6.5865020752 c 1.22210693359,1.28550720215 2.43139648438,2.09950256348 4.47590637207,2.69030761719" android:strokeColor="#FFFFFFFF" - android:strokeAlpha="0.5" android:strokeWidth="1.45" android:strokeLineCap="round" android:trimPathStart="1" /> @@ -69,7 +68,6 @@ android:name="ridge_2_path" android:pathData="M -44.0646514893,-38.1672973633 c 1.19026184082,-1.77430725098 2.67503356934,-3.24531555176 4.55902099609,-4.27278137207 c 1.88395690918,-1.0274810791 4.04466247559,-1.61137390137 6.34175109863,-1.61137390137 c 2.28761291504,0.0 4.43991088867,0.579071044922 6.31831359863,1.59861755371 c 1.8784942627,1.01954650879 3.36059570312,2.4796295166 4.55279541016,4.24153137207" android:strokeColor="#FFFFFFFF" - android:strokeAlpha="0.5" android:strokeWidth="1.45" android:strokeLineCap="round" android:trimPathStart="1" /> @@ -82,7 +80,6 @@ android:name="ridge_1_path" android:pathData="M 71.7812347412,97.0507202148 c -2.27149963379,-1.31344604492 -4.71360778809,-2.07006835938 -7.56221008301,-2.07006835938 c -2.84869384766,0.0 -5.23320007324,0.779556274414 -7.34411621094,2.07006835938" android:strokeColor="#FFFFFFFF" - android:strokeAlpha="0.5" android:strokeWidth="1.45" android:strokeLineCap="round" android:trimPathEnd="0" /> @@ -90,37 +87,39 @@ + android:name="errorcircle" + android:translateX="12" + android:translateY="12" + android:rotation="10" > + android:name="circle" > - + android:name="circlepath" + android:strokeColor="?android:attr/colorError" + android:strokeWidth="2" + android:strokeLineCap="round" + android:pathData="M 0.0,-9.0 c 4.9705627482,0.0 9.0,4.0294372518 9.0,9.0 c 0.0,4.9705627482 -4.0294372518,9.0 -9.0,9.0 c -4.9705627482,0.0 -9.0,-4.0294372518 -9.0,-9.0 c 0.0,-4.9705627482 4.0294372518,-9.0 9.0,-9.0 Z" /> + android:name="errorexclamation" + android:translateX="12" + android:translateY="12" > + android:name="exclamationbottom" + android:translateY="4" > + android:name="bottompath" + android:fillColor="?android:attr/colorError" + android:pathData="M 0.0,-1.1 l 0.0,0.0 c 0.60751322478,0.0 1.1,0.49248677522 1.1,1.1 l 0.0,0.0 c 0.0,0.60751322478 -0.49248677522,1.1 -1.1,1.1 l 0.0,0.0 c -0.60751322478,0.0 -1.1,-0.49248677522 -1.1,-1.1 l 0.0,0.0 c 0.0,-0.60751322478 0.49248677522,-1.1 1.1,-1.1 Z" /> + + + diff --git a/packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state_to_fp_animation.xml b/packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state_to_fp_animation.xml index 03515249ed0b8..2f33306c24572 100644 --- a/packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state_to_fp_animation.xml +++ b/packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state_to_fp_animation.xml @@ -1,53 +1,59 @@ +Copyright (C) 2017 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + android:name="fingerprintwhite" + android:animation="@anim/ic_fingerprint_tofp_fingerprintwhite_animation" /> + android:animation="@anim/ic_fingerprint_tofp_ridge_5_path_animation" /> + android:animation="@anim/ic_fingerprint_tofp_ridge_7_path_animation" /> + android:animation="@anim/ic_fingerprint_tofp_ridge_6_path_animation" /> + android:animation="@anim/ic_fingerprint_tofp_ridge_2_path_animation" /> + android:animation="@anim/ic_fingerprint_tofp_ridge_1_path_animation" /> + android:name="errorcircle" + android:animation="@anim/ic_fingerprint_tofp_errorcircle_animation" /> + android:name="circlepath" + android:animation="@anim/ic_fingerprint_tofp_circlepath_animation" /> + android:name="errorexclamation" + android:animation="@anim/ic_fingerprint_tofp_errorexclamation_animation" /> + android:name="exclamationbottom" + android:animation="@anim/ic_fingerprint_tofp_exclamationbottom_animation" /> + android:name="bottompath" + android:animation="@anim/ic_fingerprint_tofp_bottompath_animation" /> + + diff --git a/packages/SystemUI/res/drawable/lockscreen_fingerprint_fp_to_error_state.xml b/packages/SystemUI/res/drawable/lockscreen_fingerprint_fp_to_error_state.xml index a577afc75d9ea..218dd06dc1781 100644 --- a/packages/SystemUI/res/drawable/lockscreen_fingerprint_fp_to_error_state.xml +++ b/packages/SystemUI/res/drawable/lockscreen_fingerprint_fp_to_error_state.xml @@ -1,34 +1,36 @@ +Copyright (C) 2017 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + android:viewportHeight="24" > + android:name="fingerprintwhite" + android:translateX="12" + android:translateY="12.4" + android:scaleX="0.738" + android:scaleY="0.738" > + android:name="fingerprintwhite_pivot" + android:translateX="33" + android:translateY="34" > + android:name="fingerprinterror" + android:translateX="12" + android:translateY="12.4" + android:scaleX="0.738" + android:scaleY="0.738" > + android:name="fingerprinterror_pivot" + android:translateX="33" + android:translateY="34" > + android:name="errorcircle" + android:translateX="12" + android:translateY="12" + android:rotation="190" > + android:name="circle" > - + android:name="circlepath" + android:strokeColor="?android:attr/colorError" + android:strokeWidth="2" + android:strokeLineCap="round" + android:trimPathStart="1" + android:pathData="M 0.0,-9.0 c 4.9705627482,0.0 9.0,4.0294372518 9.0,9.0 c 0.0,4.9705627482 -4.0294372518,9.0 -9.0,9.0 c -4.9705627482,0.0 -9.0,-4.0294372518 -9.0,-9.0 c 0.0,-4.9705627482 4.0294372518,-9.0 9.0,-9.0 Z" /> + android:name="errorexclamation" + android:translateX="12" + android:translateY="12" + android:rotation="180" > + android:name="exclamationbottom" + android:translateY="4" > + android:name="bottompath" + android:fillColor="?android:attr/colorError" + android:pathData="M 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z" /> + + + diff --git a/packages/SystemUI/res/drawable/lockscreen_fingerprint_fp_to_error_state_animation.xml b/packages/SystemUI/res/drawable/lockscreen_fingerprint_fp_to_error_state_animation.xml index f7b710f395101..38096a97ad0da 100644 --- a/packages/SystemUI/res/drawable/lockscreen_fingerprint_fp_to_error_state_animation.xml +++ b/packages/SystemUI/res/drawable/lockscreen_fingerprint_fp_to_error_state_animation.xml @@ -1,71 +1,77 @@ +Copyright (C) 2017 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + android:name="fingerprintwhite" + android:animation="@anim/ic_fingerprint_toerror_fingerprintwhite_animation" /> + android:animation="@anim/ic_fingerprint_toerror_ridge_5_path_animation" /> + android:animation="@anim/ic_fingerprint_toerror_ridge_7_path_animation" /> + android:animation="@anim/ic_fingerprint_toerror_ridge_6_path_animation" /> + android:animation="@anim/ic_fingerprint_toerror_ridge_2_path_animation" /> + android:animation="@anim/ic_fingerprint_toerror_ridge_1_path_animation" /> + android:name="fingerprinterror" + android:animation="@anim/ic_fingerprint_toerror_fingerprinterror_animation" /> + android:animation="@anim/ic_fingerprint_toerror_ridge_5_path_0_animation" /> + android:animation="@anim/ic_fingerprint_toerror_ridge_7_path_0_animation" /> + android:animation="@anim/ic_fingerprint_toerror_ridge_6_path_0_animation" /> + android:animation="@anim/ic_fingerprint_toerror_ridge_2_path_0_animation" /> + android:animation="@anim/ic_fingerprint_toerror_ridge_1_path_0_animation" /> + android:name="errorcircle" + android:animation="@anim/ic_fingerprint_toerror_errorcircle_animation" /> + android:name="circlepath" + android:animation="@anim/ic_fingerprint_toerror_circlepath_animation" /> + android:name="errorexclamation" + android:animation="@anim/ic_fingerprint_toerror_errorexclamation_animation" /> + android:name="exclamationbottom" + android:animation="@anim/ic_fingerprint_toerror_exclamationbottom_animation" /> + android:name="bottompath" + android:animation="@anim/ic_fingerprint_toerror_bottompath_animation" /> + + diff --git a/packages/SystemUI/res/drawable/trusted_state_to_error.xml b/packages/SystemUI/res/drawable/trusted_state_to_error.xml index 534a9a54c3ea1..260940f4fe652 100755 --- a/packages/SystemUI/res/drawable/trusted_state_to_error.xml +++ b/packages/SystemUI/res/drawable/trusted_state_to_error.xml @@ -1,8 +1,8 @@ + android:pathData="M 0.0,0.0 c 1.0,0.0 0.6,1.0 1.0,1.0" /> diff --git a/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_1.xml b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_1.xml old mode 100755 new mode 100644 index 9ecee94bc915d..169596299bef7 --- a/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_1.xml +++ b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_1.xml @@ -1,8 +1,8 @@ + android:pathData="M 0.0,0.0 c 0.4,0.0 0.6,1.0 1.0,1.0" /> diff --git a/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_2.xml b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_2.xml old mode 100755 new mode 100644 index ae0b2d7740d59..91c08f869bafd --- a/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_2.xml +++ b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_2.xml @@ -1,8 +1,8 @@ + android:pathData="M 0.0,0.0 l 0.236439499305,0.0 c 0.763560500695,0.0 0.458136300417,1.0 0.763560500695,1.0 L 1.0,1.0" /> diff --git a/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_3.xml b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_3.xml old mode 100755 new mode 100644 index be7cc69ebda19..f5cbc31429860 --- a/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_3.xml +++ b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_3.xml @@ -1,8 +1,8 @@ + android:pathData="M 0.0,0.0 c 0.00100000000001,0.0 0.2,1.0 1.0,1.0" /> diff --git a/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_4.xml b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_4.xml old mode 100755 new mode 100644 index f8f978d7dc067..cf21d8153b43a --- a/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_4.xml +++ b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_4.xml @@ -1,8 +1,8 @@ + android:pathData="M 0.0,0.0 c 0.00100000000002,0.0 0.2,1.0 1.0,1.0" /> diff --git a/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_5.xml b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_5.xml new file mode 100644 index 0000000000000..0c18d92939335 --- /dev/null +++ b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_5.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_6.xml b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_6.xml new file mode 100644 index 0000000000000..0bf41e54d3862 --- /dev/null +++ b/packages/SystemUI/res/interpolator/error_to_trustedstate_animation_interpolator_6.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/res/interpolator/ic_bluetooth_transient_animation_interpolator_0.xml b/packages/SystemUI/res/interpolator/ic_bluetooth_transient_animation_interpolator_0.xml deleted file mode 100644 index c421f9e9e81cf..0000000000000 --- a/packages/SystemUI/res/interpolator/ic_bluetooth_transient_animation_interpolator_0.xml +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/packages/SystemUI/res/interpolator/ic_volume_expand_animation_interpolator_0.xml b/packages/SystemUI/res/interpolator/ic_caret_down_animation_interpolator_0.xml similarity index 70% rename from packages/SystemUI/res/interpolator/ic_volume_expand_animation_interpolator_0.xml rename to packages/SystemUI/res/interpolator/ic_caret_down_animation_interpolator_0.xml index c3930e42cdaab..ed90d64fdeffd 100644 --- a/packages/SystemUI/res/interpolator/ic_volume_expand_animation_interpolator_0.xml +++ b/packages/SystemUI/res/interpolator/ic_caret_down_animation_interpolator_0.xml @@ -1,5 +1,6 @@ + - + diff --git a/packages/SystemUI/res/interpolator/ic_caret_up_animation_interpolator_0.xml b/packages/SystemUI/res/interpolator/ic_caret_up_animation_interpolator_0.xml new file mode 100644 index 0000000000000..ed90d64fdeffd --- /dev/null +++ b/packages/SystemUI/res/interpolator/ic_caret_up_animation_interpolator_0.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/res/interpolator/ic_fingerprint_toerror_animation_interpolator_0.xml b/packages/SystemUI/res/interpolator/ic_fingerprint_toerror_animation_interpolator_0.xml new file mode 100644 index 0000000000000..fcd751dadb26a --- /dev/null +++ b/packages/SystemUI/res/interpolator/ic_fingerprint_toerror_animation_interpolator_0.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/res/interpolator/ic_fingerprint_toerror_animation_interpolator_1.xml b/packages/SystemUI/res/interpolator/ic_fingerprint_toerror_animation_interpolator_1.xml new file mode 100644 index 0000000000000..38dbdb71f35fd --- /dev/null +++ b/packages/SystemUI/res/interpolator/ic_fingerprint_toerror_animation_interpolator_1.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/res/interpolator/ic_fingerprint_toerror_animation_interpolator_2.xml b/packages/SystemUI/res/interpolator/ic_fingerprint_toerror_animation_interpolator_2.xml new file mode 100644 index 0000000000000..169596299bef7 --- /dev/null +++ b/packages/SystemUI/res/interpolator/ic_fingerprint_toerror_animation_interpolator_2.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/res/interpolator/ic_fingerprint_toerror_animation_interpolator_3.xml b/packages/SystemUI/res/interpolator/ic_fingerprint_toerror_animation_interpolator_3.xml new file mode 100644 index 0000000000000..8538f9895aa94 --- /dev/null +++ b/packages/SystemUI/res/interpolator/ic_fingerprint_toerror_animation_interpolator_3.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/res/interpolator/ic_fingerprint_toerror_animation_interpolator_4.xml b/packages/SystemUI/res/interpolator/ic_fingerprint_toerror_animation_interpolator_4.xml new file mode 100644 index 0000000000000..0bf41e54d3862 --- /dev/null +++ b/packages/SystemUI/res/interpolator/ic_fingerprint_toerror_animation_interpolator_4.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/res/interpolator/ic_fingerprint_toerror_animation_interpolator_5.xml b/packages/SystemUI/res/interpolator/ic_fingerprint_toerror_animation_interpolator_5.xml new file mode 100644 index 0000000000000..220209432136c --- /dev/null +++ b/packages/SystemUI/res/interpolator/ic_fingerprint_toerror_animation_interpolator_5.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/res/interpolator/ic_fingerprint_toerror_animation_interpolator_6.xml b/packages/SystemUI/res/interpolator/ic_fingerprint_toerror_animation_interpolator_6.xml new file mode 100644 index 0000000000000..0c18d92939335 --- /dev/null +++ b/packages/SystemUI/res/interpolator/ic_fingerprint_toerror_animation_interpolator_6.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/res/interpolator/ic_fingerprint_tofp_animation_interpolator_0.xml b/packages/SystemUI/res/interpolator/ic_fingerprint_tofp_animation_interpolator_0.xml new file mode 100644 index 0000000000000..ac1b566e9dc49 --- /dev/null +++ b/packages/SystemUI/res/interpolator/ic_fingerprint_tofp_animation_interpolator_0.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/res/interpolator/ic_fingerprint_tofp_animation_interpolator_1.xml b/packages/SystemUI/res/interpolator/ic_fingerprint_tofp_animation_interpolator_1.xml new file mode 100644 index 0000000000000..7f4fdbfbe38df --- /dev/null +++ b/packages/SystemUI/res/interpolator/ic_fingerprint_tofp_animation_interpolator_1.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/res/interpolator/ic_fingerprint_tofp_animation_interpolator_2.xml b/packages/SystemUI/res/interpolator/ic_fingerprint_tofp_animation_interpolator_2.xml new file mode 100644 index 0000000000000..169596299bef7 --- /dev/null +++ b/packages/SystemUI/res/interpolator/ic_fingerprint_tofp_animation_interpolator_2.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/res/interpolator/ic_fingerprint_tofp_animation_interpolator_3.xml b/packages/SystemUI/res/interpolator/ic_fingerprint_tofp_animation_interpolator_3.xml new file mode 100644 index 0000000000000..02c6cd51b65a9 --- /dev/null +++ b/packages/SystemUI/res/interpolator/ic_fingerprint_tofp_animation_interpolator_3.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/res/interpolator/ic_fingerprint_tofp_animation_interpolator_4.xml b/packages/SystemUI/res/interpolator/ic_fingerprint_tofp_animation_interpolator_4.xml new file mode 100644 index 0000000000000..7ae249e9bc4fd --- /dev/null +++ b/packages/SystemUI/res/interpolator/ic_fingerprint_tofp_animation_interpolator_4.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/res/interpolator/ic_fingerprint_tofp_animation_interpolator_5.xml b/packages/SystemUI/res/interpolator/ic_fingerprint_tofp_animation_interpolator_5.xml new file mode 100644 index 0000000000000..0c18d92939335 --- /dev/null +++ b/packages/SystemUI/res/interpolator/ic_fingerprint_tofp_animation_interpolator_5.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_to_fp_animation_interpolator_0.xml b/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_to_fp_animation_interpolator_0.xml deleted file mode 100644 index 708de2a2cb534..0000000000000 --- a/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_to_fp_animation_interpolator_0.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - diff --git a/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_to_fp_animation_interpolator_1.xml b/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_to_fp_animation_interpolator_1.xml deleted file mode 100644 index 07cae89f22b2b..0000000000000 --- a/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_to_fp_animation_interpolator_1.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - diff --git a/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_to_fp_animation_interpolator_2.xml b/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_to_fp_animation_interpolator_2.xml deleted file mode 100644 index a5ffc400901bf..0000000000000 --- a/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_to_fp_animation_interpolator_2.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - diff --git a/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_to_fp_animation_interpolator_3.xml b/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_to_fp_animation_interpolator_3.xml deleted file mode 100644 index 34156c37a079f..0000000000000 --- a/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_to_fp_animation_interpolator_3.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - diff --git a/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_to_fp_animation_interpolator_4.xml b/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_to_fp_animation_interpolator_4.xml deleted file mode 100644 index 24a3d43457962..0000000000000 --- a/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_to_fp_animation_interpolator_4.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - diff --git a/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_to_fp_animation_interpolator_5.xml b/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_to_fp_animation_interpolator_5.xml deleted file mode 100644 index c0a68e2789a74..0000000000000 --- a/packages/SystemUI/res/interpolator/lockscreen_fingerprint_error_state_to_fp_animation_interpolator_5.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - diff --git a/packages/SystemUI/res/interpolator/lockscreen_fingerprint_fp_to_error_state_animation_interpolator_0.xml b/packages/SystemUI/res/interpolator/lockscreen_fingerprint_fp_to_error_state_animation_interpolator_0.xml deleted file mode 100644 index 39c5211fe4f03..0000000000000 --- a/packages/SystemUI/res/interpolator/lockscreen_fingerprint_fp_to_error_state_animation_interpolator_0.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - diff --git a/packages/SystemUI/res/interpolator/lockscreen_fingerprint_fp_to_error_state_animation_interpolator_1.xml b/packages/SystemUI/res/interpolator/lockscreen_fingerprint_fp_to_error_state_animation_interpolator_1.xml deleted file mode 100644 index 9769a83c0d8ad..0000000000000 --- a/packages/SystemUI/res/interpolator/lockscreen_fingerprint_fp_to_error_state_animation_interpolator_1.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - diff --git a/packages/SystemUI/res/interpolator/lockscreen_fingerprint_fp_to_error_state_animation_interpolator_2.xml b/packages/SystemUI/res/interpolator/lockscreen_fingerprint_fp_to_error_state_animation_interpolator_2.xml deleted file mode 100644 index e10db01ac697f..0000000000000 --- a/packages/SystemUI/res/interpolator/lockscreen_fingerprint_fp_to_error_state_animation_interpolator_2.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - diff --git a/packages/SystemUI/res/interpolator/lockscreen_fingerprint_fp_to_error_state_animation_interpolator_3.xml b/packages/SystemUI/res/interpolator/lockscreen_fingerprint_fp_to_error_state_animation_interpolator_3.xml deleted file mode 100644 index 736eac68f9ca8..0000000000000 --- a/packages/SystemUI/res/interpolator/lockscreen_fingerprint_fp_to_error_state_animation_interpolator_3.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - diff --git a/packages/SystemUI/res/interpolator/lockscreen_fingerprint_fp_to_error_state_animation_interpolator_4.xml b/packages/SystemUI/res/interpolator/lockscreen_fingerprint_fp_to_error_state_animation_interpolator_4.xml deleted file mode 100644 index d3ae9d74ec064..0000000000000 --- a/packages/SystemUI/res/interpolator/lockscreen_fingerprint_fp_to_error_state_animation_interpolator_4.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - diff --git a/packages/SystemUI/res/interpolator/lockscreen_fingerprint_fp_to_error_state_animation_interpolator_5.xml b/packages/SystemUI/res/interpolator/lockscreen_fingerprint_fp_to_error_state_animation_interpolator_5.xml deleted file mode 100644 index a5ffc400901bf..0000000000000 --- a/packages/SystemUI/res/interpolator/lockscreen_fingerprint_fp_to_error_state_animation_interpolator_5.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - diff --git a/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_0.xml b/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_0.xml old mode 100755 new mode 100644 index 9ecee94bc915d..7f4fdbfbe38df --- a/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_0.xml +++ b/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_0.xml @@ -1,8 +1,8 @@ + android:pathData="M 0.0,0.0 c 1.0,0.0 0.6,1.0 1.0,1.0" /> diff --git a/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_1.xml b/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_1.xml old mode 100755 new mode 100644 index 87ef1d49d6abb..169596299bef7 --- a/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_1.xml +++ b/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_1.xml @@ -1,8 +1,8 @@ + android:pathData="M 0.0,0.0 c 0.4,0.0 0.6,1.0 1.0,1.0" /> diff --git a/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_2.xml b/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_2.xml old mode 100755 new mode 100644 index be7cc69ebda19..138851e307d99 --- a/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_2.xml +++ b/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_2.xml @@ -1,8 +1,8 @@ + android:pathData="M 0.0,0.0 c 0.001,0.0 0.2,1.0 1.0,1.0" /> diff --git a/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_3.xml b/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_3.xml old mode 100755 new mode 100644 index 83af65a6e60e2..7657cb6b1ac7c --- a/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_3.xml +++ b/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_3.xml @@ -1,8 +1,8 @@ + android:pathData="M 0.0,0.0 l 0.364238410596,0.0 c 0.127152317881,0.0 0.0,1.0 0.635761589404,1.0 L 1.0,1.0" /> diff --git a/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_4.xml b/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_4.xml new file mode 100644 index 0000000000000..3e5efd7699ba3 --- /dev/null +++ b/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_4.xml @@ -0,0 +1,19 @@ + + + diff --git a/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_5.xml b/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_5.xml new file mode 100644 index 0000000000000..220209432136c --- /dev/null +++ b/packages/SystemUI/res/interpolator/trusted_state_to_error_animation_interpolator_5.xml @@ -0,0 +1,19 @@ + + +