diff options
Diffstat (limited to 'data/res/anim')
23 files changed, 1157 insertions, 691 deletions
diff --git a/data/res/anim/ic_bluetooth_transient_animation_0.xml b/data/res/anim/ic_bluetooth_transient_animation_0.xml new file mode 100644 index 0000000..f14cfcf --- /dev/null +++ b/data/res/anim/ic_bluetooth_transient_animation_0.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2019 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 + --> + +<set xmlns:android="http://schemas.android.com/apk/res/android" android:ordering="together"> + <objectAnimator android:propertyName="fillAlpha" android:duration="17" + android:startOffset="0" android:valueFrom="1" android:valueTo="0.5" + android:valueType="floatType" + android:interpolator="@*android:interpolator/transient_interpolator"/> + <objectAnimator android:propertyName="fillAlpha" android:duration="233" + android:startOffset="17" android:valueFrom="0.5" + android:valueTo="0.5" android:valueType="floatType" + android:interpolator="@*android:interpolator/transient_interpolator"/> + <objectAnimator android:propertyName="fillAlpha" android:duration="17" + android:startOffset="250" android:valueFrom="0.5" + android:valueTo="1" android:valueType="floatType" + android:interpolator="@*android:interpolator/transient_interpolator"/> + <objectAnimator android:propertyName="fillAlpha" android:duration="233" + android:startOffset="267" android:valueFrom="1" android:valueTo="1" + android:valueType="floatType" + android:interpolator="@*android:interpolator/transient_interpolator"/> + <objectAnimator android:propertyName="fillAlpha" android:duration="17" + android:startOffset="500" android:valueFrom="1" + android:valueTo="0.5" android:valueType="floatType" + android:interpolator="@*android:interpolator/transient_interpolator"/> + <objectAnimator android:propertyName="fillAlpha" android:duration="233" + android:startOffset="517" android:valueFrom="0.5" + android:valueTo="0.5" android:valueType="floatType" + android:interpolator="@*android:interpolator/transient_interpolator"/> + <objectAnimator android:propertyName="fillAlpha" android:duration="17" + android:startOffset="750" android:valueFrom="0.5" + android:valueTo="1" android:valueType="floatType" + android:interpolator="@*android:interpolator/transient_interpolator"/> +</set> diff --git a/data/res/anim/ic_bluetooth_transient_animation_1.xml b/data/res/anim/ic_bluetooth_transient_animation_1.xml new file mode 100644 index 0000000..934bd17 --- /dev/null +++ b/data/res/anim/ic_bluetooth_transient_animation_1.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2019 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 + --> + +<set xmlns:android="http://schemas.android.com/apk/res/android" android:ordering="together"> + <objectAnimator android:propertyName="fillAlpha" android:duration="250" + android:startOffset="0" android:valueFrom="1" android:valueTo="1" + android:valueType="floatType" + android:interpolator="@*android:interpolator/transient_interpolator"/> + <objectAnimator android:propertyName="fillAlpha" android:duration="17" + android:startOffset="250" android:valueFrom="1" + android:valueTo="0.5" android:valueType="floatType" + android:interpolator="@*android:interpolator/transient_interpolator"/> + <objectAnimator android:propertyName="fillAlpha" android:duration="233" + android:startOffset="267" android:valueFrom="0.5" + android:valueTo="0.5" android:valueType="floatType" + android:interpolator="@*android:interpolator/transient_interpolator"/> + <objectAnimator android:propertyName="fillAlpha" android:duration="17" + android:startOffset="500" android:valueFrom="0.5" + android:valueTo="1" android:valueType="floatType" + android:interpolator="@*android:interpolator/transient_interpolator"/> + <objectAnimator android:propertyName="fillAlpha" android:duration="233" + android:startOffset="517" android:valueFrom="1" android:valueTo="1" + android:valueType="floatType" + android:interpolator="@*android:interpolator/transient_interpolator"/> + <objectAnimator android:propertyName="fillAlpha" android:duration="17" + android:startOffset="750" android:valueFrom="1" + android:valueTo="0.5" android:valueType="floatType" + android:interpolator="@*android:interpolator/transient_interpolator"/> +</set> diff --git a/data/res/anim/ic_bluetooth_transient_animation_2.xml b/data/res/anim/ic_bluetooth_transient_animation_2.xml new file mode 100644 index 0000000..7dce34c --- /dev/null +++ b/data/res/anim/ic_bluetooth_transient_animation_2.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2019 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 + --> +<set xmlns:android="http://schemas.android.com/apk/res/android" android:ordering="together"> + <objectAnimator android:propertyName="translateX" android:duration="1000" + android:startOffset="0" android:valueFrom="0" android:valueTo="1" + android:valueType="floatType"/> +</set> diff --git a/data/res/anim/ic_hotspot_transient_animation_0.xml b/data/res/anim/ic_hotspot_transient_animation_0.xml new file mode 100644 index 0000000..d5a4c52 --- /dev/null +++ b/data/res/anim/ic_hotspot_transient_animation_0.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2019 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 + --> +<set xmlns:android="http://schemas.android.com/apk/res/android" android:ordering="together"> + <objectAnimator android:propertyName="fillAlpha" android:duration="17" + android:startOffset="0" android:valueFrom="1" android:valueTo="0.5" + android:valueType="floatType" + android:interpolator="@*android:interpolator/transient_interpolator"/> + <objectAnimator android:propertyName="fillAlpha" android:duration="633" + android:startOffset="17" android:valueFrom="0.5" + android:valueTo="0.5" android:valueType="floatType" + android:interpolator="@*android:interpolator/transient_interpolator"/> + <objectAnimator android:propertyName="fillAlpha" android:duration="17" + android:startOffset="650" android:valueFrom="0.5" + android:valueTo="1" android:valueType="floatType" + android:interpolator="@*android:interpolator/transient_interpolator"/> +</set> diff --git a/data/res/anim/ic_hotspot_transient_animation_1.xml b/data/res/anim/ic_hotspot_transient_animation_1.xml new file mode 100644 index 0000000..36db4b9 --- /dev/null +++ b/data/res/anim/ic_hotspot_transient_animation_1.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2019 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 + --> +<set xmlns:android="http://schemas.android.com/apk/res/android" android:ordering="together"> + <objectAnimator android:propertyName="fillAlpha" android:duration="200" + android:startOffset="0" android:valueFrom="1" android:valueTo="1" + android:valueType="floatType" + android:interpolator="@*android:interpolator/transient_interpolator"/> + <objectAnimator android:propertyName="fillAlpha" android:duration="17" + android:startOffset="200" android:valueFrom="1" + android:valueTo="0.5" android:valueType="floatType" + android:interpolator="@*android:interpolator/transient_interpolator"/> + <objectAnimator android:propertyName="fillAlpha" android:duration="617" + android:startOffset="217" android:valueFrom="0.5" + android:valueTo="0.5" android:valueType="floatType" + android:interpolator="@*android:interpolator/transient_interpolator"/> + <objectAnimator android:propertyName="fillAlpha" android:duration="17" + android:startOffset="833" android:valueFrom="0.5" + android:valueTo="1" android:valueType="floatType" + android:interpolator="@*android:interpolator/transient_interpolator"/> +</set> diff --git a/data/res/anim/ic_hotspot_transient_animation_2.xml b/data/res/anim/ic_hotspot_transient_animation_2.xml new file mode 100644 index 0000000..3d67436 --- /dev/null +++ b/data/res/anim/ic_hotspot_transient_animation_2.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2019 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 + --> + +<set xmlns:android="http://schemas.android.com/apk/res/android" android:ordering="together"> + <objectAnimator android:propertyName="fillAlpha" android:duration="400" + android:startOffset="0" android:valueFrom="1" android:valueTo="1" + android:valueType="floatType" + android:interpolator="@*android:interpolator/transient_interpolator"/> + <objectAnimator android:propertyName="fillAlpha" android:duration="17" + android:startOffset="400" android:valueFrom="1" + android:valueTo="0.5" android:valueType="floatType" + android:interpolator="@*android:interpolator/transient_interpolator"/> + <objectAnimator android:propertyName="fillAlpha" android:duration="617" + android:startOffset="417" android:valueFrom="0.5" + android:valueTo="0.5" android:valueType="floatType" + android:interpolator="@*android:interpolator/transient_interpolator"/> + <objectAnimator android:propertyName="fillAlpha" android:duration="17" + android:startOffset="1033" android:valueFrom="0.5" + android:valueTo="1" android:valueType="floatType" + android:interpolator="@*android:interpolator/transient_interpolator"/> +</set> diff --git a/data/res/anim/ic_hotspot_transient_animation_3.xml b/data/res/anim/ic_hotspot_transient_animation_3.xml new file mode 100644 index 0000000..1495dc9 --- /dev/null +++ b/data/res/anim/ic_hotspot_transient_animation_3.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2019 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 + --> + +<set xmlns:android="http://schemas.android.com/apk/res/android" android:ordering="together"> + <objectAnimator android:propertyName="translateX" android:duration="1250" + android:startOffset="0" android:valueFrom="0" android:valueTo="1" + android:valueType="floatType"/> +</set> diff --git a/data/res/anim/ic_signal_wifi_transient_animation_0.xml b/data/res/anim/ic_signal_wifi_transient_animation_0.xml new file mode 100644 index 0000000..f71d0ee --- /dev/null +++ b/data/res/anim/ic_signal_wifi_transient_animation_0.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2019 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. +--> +<set xmlns:android="http://schemas.android.com/apk/res/android" android:ordering="together"> + <objectAnimator android:propertyName="scaleY" android:duration="0" + android:startOffset="167" android:valueFrom="1" android:valueTo="0" + android:valueType="floatType"/> +</set>
\ No newline at end of file diff --git a/data/res/anim/ic_signal_wifi_transient_animation_1.xml b/data/res/anim/ic_signal_wifi_transient_animation_1.xml new file mode 100644 index 0000000..9af42a1 --- /dev/null +++ b/data/res/anim/ic_signal_wifi_transient_animation_1.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2019 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. +--> +<set xmlns:android="http://schemas.android.com/apk/res/android" android:ordering="together"> + <objectAnimator android:propertyName="scaleX" android:duration="0" + android:startOffset="167" android:valueFrom="0" android:valueTo="1" + android:valueType="floatType"/> +</set>
\ No newline at end of file diff --git a/data/res/anim/ic_signal_wifi_transient_animation_2.xml b/data/res/anim/ic_signal_wifi_transient_animation_2.xml new file mode 100644 index 0000000..0e7864a --- /dev/null +++ b/data/res/anim/ic_signal_wifi_transient_animation_2.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2019 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. +--> +<set xmlns:android="http://schemas.android.com/apk/res/android" android:ordering="together"> + <objectAnimator android:propertyName="scaleY" android:duration="0" + android:startOffset="333" android:valueFrom="1" android:valueTo="0" + android:valueType="floatType"/> +</set>
\ No newline at end of file diff --git a/data/res/anim/ic_signal_wifi_transient_animation_3.xml b/data/res/anim/ic_signal_wifi_transient_animation_3.xml new file mode 100644 index 0000000..bbec629 --- /dev/null +++ b/data/res/anim/ic_signal_wifi_transient_animation_3.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2019 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. +--> +<set xmlns:android="http://schemas.android.com/apk/res/android" android:ordering="together"> + <objectAnimator android:propertyName="scaleX" android:duration="0" + android:startOffset="333" android:valueFrom="0" android:valueTo="1" + android:valueType="floatType"/> +</set>
\ No newline at end of file diff --git a/data/res/anim/ic_signal_wifi_transient_animation_4.xml b/data/res/anim/ic_signal_wifi_transient_animation_4.xml new file mode 100644 index 0000000..2c921b1 --- /dev/null +++ b/data/res/anim/ic_signal_wifi_transient_animation_4.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2019 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. +--> +<set xmlns:android="http://schemas.android.com/apk/res/android" android:ordering="together"> + <objectAnimator android:propertyName="scaleY" android:duration="0" + android:startOffset="500" android:valueFrom="1" android:valueTo="0" + android:valueType="floatType"/> +</set>
\ No newline at end of file diff --git a/data/res/anim/ic_signal_wifi_transient_animation_5.xml b/data/res/anim/ic_signal_wifi_transient_animation_5.xml new file mode 100644 index 0000000..51aedc0 --- /dev/null +++ b/data/res/anim/ic_signal_wifi_transient_animation_5.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2019 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. +--> +<set xmlns:android="http://schemas.android.com/apk/res/android" android:ordering="together"> + <objectAnimator android:propertyName="scaleX" android:duration="0" + android:startOffset="500" android:valueFrom="0" android:valueTo="1" + android:valueType="floatType"/> +</set>
\ No newline at end of file diff --git a/data/res/anim/ic_signal_wifi_transient_animation_6.xml b/data/res/anim/ic_signal_wifi_transient_animation_6.xml new file mode 100644 index 0000000..d1da131 --- /dev/null +++ b/data/res/anim/ic_signal_wifi_transient_animation_6.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2019 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. +--> +<set xmlns:android="http://schemas.android.com/apk/res/android" android:ordering="together"> + <objectAnimator android:propertyName="scaleY" android:duration="0" + android:startOffset="667" android:valueFrom="1" android:valueTo="0" + android:valueType="floatType"/> +</set>
\ No newline at end of file diff --git a/data/res/anim/ic_signal_wifi_transient_animation_7.xml b/data/res/anim/ic_signal_wifi_transient_animation_7.xml new file mode 100644 index 0000000..0b6eb42 --- /dev/null +++ b/data/res/anim/ic_signal_wifi_transient_animation_7.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2019 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. +--> +<set xmlns:android="http://schemas.android.com/apk/res/android" android:ordering="together"> + <objectAnimator android:propertyName="scaleX" android:duration="0" + android:startOffset="667" android:valueFrom="0" android:valueTo="1" + android:valueType="floatType"/> +</set>
\ No newline at end of file diff --git a/data/res/anim/ic_signal_wifi_transient_animation_8.xml b/data/res/anim/ic_signal_wifi_transient_animation_8.xml new file mode 100644 index 0000000..3469d43 --- /dev/null +++ b/data/res/anim/ic_signal_wifi_transient_animation_8.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2019 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. +--> +<set xmlns:android="http://schemas.android.com/apk/res/android" android:ordering="together"> + <objectAnimator android:propertyName="translateX" android:duration="833" + android:startOffset="0" android:valueFrom="0" android:valueTo="1" + android:valueType="floatType"/> +</set>
\ No newline at end of file diff --git a/data/res/anim/lock_in.xml b/data/res/anim/lock_in.xml index e687f9f..c7014e8 100644 --- a/data/res/anim/lock_in.xml +++ b/data/res/anim/lock_in.xml @@ -1,5 +1,4 @@ -<!-- - Copyright (C) 2019 The Android Open Source Project +<!-- Copyright (C) 2019 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. @@ -16,102 +15,116 @@ <animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"> <aapt:attr name="android:drawable"> - <vector android:height="32dp" android:width="32dp" android:viewportHeight="32" + <vector android:height="42dp" android:width="32dp" android:viewportHeight="42" android:viewportWidth="32"> <group android:name="_R_G"> - <group android:name="_R_G_L_2_G_N_2_N_1_T_0" android:translateX="16" - android:translateY="16" android:scaleX="1.3" android:scaleY="1.3"> - <group android:name="_R_G_L_2_G_N_2_T_0" android:translateX="-2.25" - android:translateY="0.75" android:pivotX="2.25" android:pivotY="2.25" - android:scaleX="0" android:scaleY="0"> - <group android:name="_R_G_L_2_G_T_1" android:translateX="2.25" - android:translateY="2.373" android:scaleX="0.12346" - android:scaleY="0.12346"> - <group android:name="_R_G_L_2_G" android:translateY="32"> - <path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="#ff0000" - android:fillAlpha="0" android:fillType="nonZero" - android:trimPathStart="0.14" android:trimPathEnd="0.89" - android:trimPathOffset="0" - android:pathData=" M-28.21 -31.92 C-28.21,-31.92 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.97,-31.67 27.97,-31.67 "/> - <path android:name="_R_G_L_2_G_D_1_P_0" - android:strokeColor="#000" android:strokeLineCap="round" - android:strokeLineJoin="round" android:strokeWidth="16" - android:strokeAlpha="1" android:trimPathStart="0.14" - android:trimPathEnd="0.89" android:trimPathOffset="0" - android:pathData=" M-28.21 -31.92 C-28.21,-31.92 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.97,-31.67 27.97,-31.67 "/> - </group> - </group> - </group> + <group android:name="_R_G_L_2_G" android:translateX="1.6669999999999998" + android:translateY="11.992999999999999" android:pivotX="14.333" + android:pivotY="13" android:scaleX="0" android:scaleY="0"> + <path android:name="_R_G_L_2_G_D_0_P_0" android:strokeColor="#ffffff" + android:strokeLineCap="round" android:strokeLineJoin="round" + android:strokeWidth="2" android:strokeAlpha="1" + android:pathData=" M22.33 21 C22.33,21 6.33,21 6.33,21 C5.6,21 5,20.4 5,19.67 C5,19.67 5,6.33 5,6.33 C5,5.6 5.6,5 6.33,5 C6.33,5 22.33,5 22.33,5 C23.07,5 23.67,5.6 23.67,6.33 C23.67,6.33 23.67,19.67 23.67,19.67 C23.67,20.4 23.07,21 22.33,21c "/> </group> - <group android:name="_R_G_L_1_G_N_1_T_0" android:translateX="16" - android:translateY="16" android:scaleX="1.3" android:scaleY="1.3"> - <group android:name="_R_G_L_1_G" android:translateX="-8.25" - android:translateY="-4.25" android:pivotX="8.25" android:pivotY="7.25" - android:scaleX="0" android:scaleY="0"> - <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="#000" + <group android:name="_R_G_L_1_G_N_4_T_0" android:translateX="1.6669999999999998" + android:translateY="11.992999999999999" android:pivotX="14.333" + android:pivotY="13" android:scaleX="0" android:scaleY="0"> + <group android:name="_R_G_L_1_G" android:translateX="11.583" + android:translateY="10.257"> + <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="#ffffff" android:fillAlpha="1" android:fillType="nonZero" - android:pathData=" M14.25 0.25 C14.25,0.25 12.75,0.25 12.75,0.25 C12.75,0.25 10.75,0.25 10.75,0.25 C10.75,0.25 5.75,0.25 5.75,0.25 C5.75,0.25 3.75,0.25 3.75,0.25 C3.75,0.25 2.25,0.25 2.25,0.25 C1.15,0.25 0.25,1.15 0.25,2.25 C0.25,2.25 0.25,12.25 0.25,12.25 C0.25,13.35 1.15,14.25 2.25,14.25 C2.25,14.25 14.25,14.25 14.25,14.25 C15.35,14.25 16.25,13.35 16.25,12.25 C16.25,12.25 16.25,2.25 16.25,2.25 C16.25,1.15 15.35,0.25 14.25,0.25c M14.25 12.25 C14.25,12.25 2.25,12.25 2.25,12.25 C2.25,12.25 2.25,2.25 2.25,2.25 C2.25,2.25 3.75,2.25 3.75,2.25 C3.75,2.25 12.75,2.25 12.75,2.25 C12.75,2.25 14.25,2.25 14.25,2.25 C14.25,2.25 14.25,12.25 14.25,12.25c "/> + android:pathData=" M2.75 0.25 C4.13,0.25 5.25,1.37 5.25,2.75 C5.25,4.13 4.13,5.25 2.75,5.25 C1.37,5.25 0.25,4.13 0.25,2.75 C0.25,1.37 1.37,0.25 2.75,0.25c "/> </group> </group> - <group android:name="_R_G_L_0_G_N_1_T_0" android:translateX="16" - android:translateY="16" android:scaleX="1.3" android:scaleY="1.3"> - <group android:name="_R_G_L_0_G" android:translateX="-2.25" - android:translateY="0.75" android:pivotX="2.25" android:pivotY="2.25" - android:scaleX="0" android:scaleY="0"> - <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="#000" - android:fillAlpha="1" android:fillType="nonZero" - android:pathData=" M2.25 0.25 C3.35,0.25 4.25,1.15 4.25,2.25 C4.25,3.35 3.35,4.25 2.25,4.25 C1.15,4.25 0.25,3.35 0.25,2.25 C0.25,1.15 1.15,0.25 2.25,0.25c "/> + <group android:name="_R_G_L_0_G_N_4_T_0" android:translateX="1.6669999999999998" + android:translateY="11.992999999999999" android:pivotX="14.333" + android:pivotY="13" android:scaleX="0" android:scaleY="0"> + <group android:name="_R_G_L_0_G_T_1" android:translateX="14.333" + android:translateY="3.172"> + <group android:name="_R_G_L_0_G" android:translateX="-9.667" + android:translateY="-9.667"> + <path android:name="_R_G_L_0_G_D_0_P_0" android:strokeColor="#ffffff" + android:strokeLineCap="round" android:strokeLineJoin="round" + android:strokeWidth="2" android:strokeAlpha="1" + android:trimPathStart="0.14" android:trimPathEnd="0.89" + android:trimPathOffset="0" + android:pathData=" M14.33 14.33 C14.33,14.33 14.33,9.67 14.33,9.67 C14.33,7.09 12.24,5 9.67,5 C7.09,5 5,7.09 5,9.67 C5,9.67 5,14.33 5,14.33 "/> + </group> </group> </group> </group> <group android:name="time_group"/> </vector> </aapt:attr> - <target android:name="_R_G_L_2_G_D_0_P_0"> + <target android:name="_R_G_L_2_G"> <aapt:attr name="android:animation"> <set android:ordering="together"> - <objectAnimator android:propertyName="trimPathStart" android:duration="50" - android:startOffset="0" android:valueFrom="0.14" - android:valueTo="0.14" android:valueType="floatType"> + <objectAnimator android:propertyName="scaleX" android:duration="233" + android:startOffset="0" android:valueFrom="0" android:valueTo="1.02" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0.438,1 1.0,1.0"/> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="trimPathStart" android:duration="67" - android:startOffset="50" android:valueFrom="0.14" - android:valueTo="0" android:valueType="floatType"> + <objectAnimator android:propertyName="scaleY" android:duration="233" + android:startOffset="0" android:valueFrom="0" android:valueTo="1.02" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0.438,1 1.0,1.0"/> + </aapt:attr> + </objectAnimator> + <objectAnimator android:propertyName="scaleX" android:duration="117" + android:startOffset="233" android:valueFrom="1.02" + android:valueTo="1" android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.565,1 1.0,1.0"/> + </aapt:attr> + </objectAnimator> + <objectAnimator android:propertyName="scaleY" android:duration="117" + android:startOffset="233" android:valueFrom="1.02" + android:valueTo="1" android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.565,1 1.0,1.0"/> </aapt:attr> </objectAnimator> </set> </aapt:attr> </target> - <target android:name="_R_G_L_2_G_D_0_P_0"> + <target android:name="_R_G_L_1_G_N_4_T_0"> <aapt:attr name="android:animation"> <set android:ordering="together"> - <objectAnimator android:propertyName="trimPathEnd" android:duration="50" - android:startOffset="0" android:valueFrom="0.89" - android:valueTo="0.89" android:valueType="floatType"> + <objectAnimator android:propertyName="scaleX" android:duration="233" + android:startOffset="0" android:valueFrom="0" android:valueTo="1.02" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0.438,1 1.0,1.0"/> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="trimPathEnd" android:duration="67" - android:startOffset="50" android:valueFrom="0.89" + <objectAnimator android:propertyName="scaleY" android:duration="233" + android:startOffset="0" android:valueFrom="0" android:valueTo="1.02" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0.438,1 1.0,1.0"/> + </aapt:attr> + </objectAnimator> + <objectAnimator android:propertyName="scaleX" android:duration="117" + android:startOffset="233" android:valueFrom="1.02" android:valueTo="1" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.565,1 1.0,1.0"/> + </aapt:attr> + </objectAnimator> + <objectAnimator android:propertyName="scaleY" android:duration="117" + android:startOffset="233" android:valueFrom="1.02" + android:valueTo="1" android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.565,1 1.0,1.0"/> </aapt:attr> </objectAnimator> </set> </aapt:attr> </target> - <target android:name="_R_G_L_2_G_D_1_P_0"> + <target android:name="_R_G_L_0_G_D_0_P_0"> <aapt:attr name="android:animation"> <set android:ordering="together"> <objectAnimator android:propertyName="trimPathStart" android:duration="50" @@ -133,7 +146,7 @@ </set> </aapt:attr> </target> - <target android:name="_R_G_L_2_G_D_1_P_0"> + <target android:name="_R_G_L_0_G_D_0_P_0"> <aapt:attr name="android:animation"> <set android:ordering="together"> <objectAnimator android:propertyName="trimPathEnd" android:duration="50" @@ -155,130 +168,48 @@ </set> </aapt:attr> </target> - <target android:name="_R_G_L_2_G_T_1"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> - <objectAnimator android:propertyName="translateXY" android:duration="150" - android:startOffset="0" android:propertyXName="translateX" - android:propertyYName="translateY" - android:pathData="M 2.25,2.373C 2.25,1.2001604776382402 2.25,-3.49116047763824 2.25,-4.664"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0.2,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="_R_G_L_2_G_N_2_T_0"> + <target android:name="_R_G_L_0_G_T_1"> <aapt:attr name="android:animation"> <set android:ordering="together"> - <objectAnimator android:propertyName="scaleX" android:duration="233" - android:startOffset="0" android:valueFrom="0" - android:valueTo="1.0125" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.043,0.556 0.667,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="233" - android:startOffset="0" android:valueFrom="0" - android:valueTo="1.0125" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.043,0.556 0.667,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="117" - android:startOffset="233" android:valueFrom="1.0125" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="117" - android:startOffset="233" android:valueFrom="1.0125" - android:valueTo="1" android:valueType="floatType"> + <objectAnimator android:propertyName="translateY" android:duration="150" + android:startOffset="0" android:valueFrom="3.172" + android:valueTo="0.34" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.23,-0.46 0.2,1 1.0,1.0"/> </aapt:attr> </objectAnimator> </set> </aapt:attr> </target> - <target android:name="_R_G_L_2_G_N_2_N_1_T_0"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> - <objectAnimator android:propertyName="scaleX" android:duration="0" - android:startOffset="50" android:valueFrom="0" android:valueTo="1.3" - android:valueType="floatType"/> - </set> - </aapt:attr> - </target> - <target android:name="_R_G_L_1_G"> + <target android:name="_R_G_L_0_G_N_4_T_0"> <aapt:attr name="android:animation"> <set android:ordering="together"> <objectAnimator android:propertyName="scaleX" android:duration="233" - android:startOffset="0" android:valueFrom="0" - android:valueTo="1.025" android:valueType="floatType"> + android:startOffset="0" android:valueFrom="0" android:valueTo="1.02" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0.2,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0.438,1 1.0,1.0"/> </aapt:attr> </objectAnimator> <objectAnimator android:propertyName="scaleY" android:duration="233" - android:startOffset="0" android:valueFrom="0" - android:valueTo="1.025" android:valueType="floatType"> + android:startOffset="0" android:valueFrom="0" android:valueTo="1.02" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0.2,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="117" - android:startOffset="233" android:valueFrom="1.025" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="117" - android:startOffset="233" android:valueFrom="1.025" - android:valueTo="1" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="_R_G_L_0_G"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> - <objectAnimator android:propertyName="scaleX" android:duration="233" - android:startOffset="0" android:valueFrom="0" - android:valueTo="1.0125" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.043,0.556 0.667,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="233" - android:startOffset="0" android:valueFrom="0" - android:valueTo="1.0125" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.043,0.556 0.667,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0.438,1 1.0,1.0"/> </aapt:attr> </objectAnimator> <objectAnimator android:propertyName="scaleX" android:duration="117" - android:startOffset="233" android:valueFrom="1.0125" + android:startOffset="233" android:valueFrom="1.02" android:valueTo="1" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.565,1 1.0,1.0"/> </aapt:attr> </objectAnimator> <objectAnimator android:propertyName="scaleY" android:duration="117" - android:startOffset="233" android:valueFrom="1.0125" + android:startOffset="233" android:valueFrom="1.02" android:valueTo="1" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.565,1 1.0,1.0"/> </aapt:attr> </objectAnimator> </set> diff --git a/data/res/anim/lock_lock.xml b/data/res/anim/lock_lock.xml index 8fc4f05..3b8c485 100644 --- a/data/res/anim/lock_lock.xml +++ b/data/res/anim/lock_lock.xml @@ -1,5 +1,4 @@ -<!-- - Copyright (C) 2019 The Android Open Source Project +<!-- Copyright (C) 2019 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. @@ -14,90 +13,114 @@ limitations under the License. --> <animated-vector xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:aapt="http://schemas.android.com/aapt"> + xmlns:aapt="http://schemas.android.com/aapt"> <aapt:attr name="android:drawable"> - <vector android:height="32dp" android:width="32dp" android:viewportHeight="32" - android:viewportWidth="32"> + <vector + android:width="32dp" + android:height="40dp" + android:viewportWidth="32" + android:viewportHeight="40"> <group android:name="_R_G"> - <group android:name="_R_G_L_2_G_N_1_T_0" android:translateX="16" - android:translateY="16" android:scaleX="1.3" android:scaleY="1.3"> - <group android:name="_R_G_L_2_G_T_1" android:translateX="0" - android:translateY="3"> - <group android:name="_R_G_L_2_G" android:translateX="-8.25" - android:translateY="-7.25"> - <path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="#000" - android:fillAlpha="1" android:fillType="nonZero" - android:pathData=" M14.25 0.25 C14.25,0.25 12.75,0.25 12.75,0.25 C12.75,0.25 10.75,0.25 10.75,0.25 C10.75,0.25 5.75,0.25 5.75,0.25 C5.75,0.25 3.75,0.25 3.75,0.25 C3.75,0.25 2.25,0.25 2.25,0.25 C1.15,0.25 0.25,1.15 0.25,2.25 C0.25,2.25 0.25,12.25 0.25,12.25 C0.25,13.35 1.15,14.25 2.25,14.25 C2.25,14.25 14.25,14.25 14.25,14.25 C15.35,14.25 16.25,13.35 16.25,12.25 C16.25,12.25 16.25,2.25 16.25,2.25 C16.25,1.15 15.35,0.25 14.25,0.25c M14.25 12.25 C14.25,12.25 2.25,12.25 2.25,12.25 C2.25,12.25 2.25,2.25 2.25,2.25 C2.25,2.25 3.75,2.25 3.75,2.25 C3.75,2.25 12.75,2.25 12.75,2.25 C12.75,2.25 14.25,2.25 14.25,2.25 C14.25,2.25 14.25,12.25 14.25,12.25c "/> - </group> + <group + android:name="_R_G_L_2_G_T_1" + android:translateX="16" + android:translateY="23.993"> + <group + android:name="_R_G_L_2_G" + android:translateX="-14.333" + android:translateY="-13"> + <path + android:name="_R_G_L_2_G_D_0_P_0" + android:pathData=" M22.33 21 C22.33,21 6.33,21 6.33,21 C5.6,21 5,20.4 5,19.67 C5,19.67 5,6.33 5,6.33 C5,5.6 5.6,5 6.33,5 C6.33,5 22.33,5 22.33,5 C23.07,5 23.67,5.6 23.67,6.33 C23.67,6.33 23.67,19.67 23.67,19.67 C23.67,20.4 23.07,21 22.33,21c " + android:strokeWidth="2" + android:strokeAlpha="1" + android:strokeColor="#ffffff" /> </group> </group> - <group android:name="_R_G_L_1_G_N_4_N_1_T_0" android:translateX="16" - android:translateY="16" android:scaleX="1.3" android:scaleY="1.3"> - <group android:name="_R_G_L_1_G_N_4_T_1" android:translateX="0" - android:translateY="3"> - <group android:name="_R_G_L_1_G_N_4_T_0" android:translateX="-8.25" - android:translateY="-7.25"> - <group android:name="_R_G_L_1_G" android:translateX="6" - android:translateY="5" android:pivotX="2.25" - android:pivotY="2.25" android:scaleX="1" android:scaleY="1"> - <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="#000" - android:fillAlpha="1" android:fillType="nonZero" - android:pathData=" M2.25 0.25 C3.35,0.25 4.25,1.15 4.25,2.25 C4.25,3.35 3.35,4.25 2.25,4.25 C1.15,4.25 0.25,3.35 0.25,2.25 C0.25,1.15 1.15,0.25 2.25,0.25c "/> - </group> + <group + android:name="_R_G_L_1_G_N_4_T_1" + android:translateX="16" + android:translateY="23.993"> + <group + android:name="_R_G_L_1_G_N_4_T_0" + android:translateX="-14.333" + android:translateY="-13"> + <group + android:name="_R_G_L_1_G" + android:pivotX="2.75" + android:pivotY="2.75" + android:scaleX="1" + android:scaleY="1" + android:translateX="11.583" + android:translateY="10.257"> + <path + android:name="_R_G_L_1_G_D_0_P_0" + android:fillAlpha="1" + android:fillColor="#ffffff" + android:fillType="nonZero" + android:pathData=" M2.75 0.25 C4.13,0.25 5.25,1.37 5.25,2.75 C5.25,4.13 4.13,5.25 2.75,5.25 C1.37,5.25 0.25,4.13 0.25,2.75 C0.25,1.37 1.37,0.25 2.75,0.25c " /> </group> </group> </group> - <group android:name="_R_G_L_0_G_N_4_N_1_T_0" android:translateX="16" - android:translateY="16" android:scaleX="1.3" android:scaleY="1.3"> - <group android:name="_R_G_L_0_G_N_4_T_1" android:translateX="0" - android:translateY="3"> - <group android:name="_R_G_L_0_G_N_4_T_0" android:translateX="-8.25" - android:translateY="-7.25"> - <group android:name="_R_G_L_0_G" android:translateX="-16.219" - android:translateY="32.25" android:pivotX="27.965" - android:pivotY="-32" android:scaleX="0.125" - android:scaleY="0.125"> - <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="#ff0000" - android:fillAlpha="0" android:fillType="nonZero" - android:pathData=" M79.79 -48.55 C79.79,-48.55 79.75,-53.75 79.78,-55.48 C79.83,-57.62 79.08,-78.36 53.07,-78.83 C29.5,-79.25 25.2,-59.38 25.22,-58.27 C25.25,-56.25 24.97,-31.17 24.97,-31.17 "/> - <path android:name="_R_G_L_0_G_D_1_P_0" - android:strokeColor="#000" android:strokeLineCap="round" - android:strokeLineJoin="round" android:strokeWidth="16" - android:strokeAlpha="1" - android:pathData=" M79.79 -48.55 C79.79,-48.55 79.75,-53.75 79.78,-55.48 C79.83,-57.62 79.08,-78.36 53.07,-78.83 C29.5,-79.25 25.2,-59.38 25.22,-58.27 C25.25,-56.25 24.97,-31.17 24.97,-31.17 "/> - </group> + <group + android:name="_R_G_L_0_G_N_4_T_1" + android:translateX="16" + android:translateY="23.993"> + <group + android:name="_R_G_L_0_G_N_4_T_0" + android:translateX="-14.333" + android:translateY="-13"> + <group + android:name="_R_G_L_0_G" + android:translateX="4.666" + android:translateY="-9.327"> + <path + android:name="_R_G_L_0_G_D_0_P_0" + android:pathData=" M14.33 14.33 C14.33,14.33 14.32,9.42 14.32,9.42 C14.32,7.4 15.67,5.01 18.65,5 C21.76,4.99 23.07,7.37 23.05,9.47 C23.05,9.47 23.06,9.77 23.06,9.77 " + android:strokeWidth="2" + android:strokeAlpha="1" + android:strokeColor="#ffffff" /> </group> </group> </group> </group> - <group android:name="time_group"/> + <group android:name="time_group" /> </vector> </aapt:attr> <target android:name="_R_G_L_2_G_T_1"> <aapt:attr name="android:animation"> <set android:ordering="together"> - <objectAnimator android:propertyName="translateXY" android:duration="400" - android:startOffset="0" android:propertyXName="translateX" - android:propertyYName="translateY" - android:pathData="M 0,3C 0,3.09895833581686 0,3 0,3"> + <objectAnimator + android:duration="400" + android:propertyName="translateY" + android:startOffset="0" + android:valueFrom="23.993" + android:valueTo="23.993" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.667,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="translateXY" android:duration="67" - android:startOffset="400" android:propertyXName="translateX" - android:propertyYName="translateY" - android:pathData="M 0,3C 0,3.09895833581686 0,3.594 0,3.594"> + <objectAnimator + android:duration="67" + android:propertyName="translateY" + android:startOffset="400" + android:valueFrom="23.993" + android:valueTo="25.368" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.58,0 0.549,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="translateXY" android:duration="83" - android:startOffset="467" android:propertyXName="translateX" - android:propertyYName="translateY" - android:pathData="M 0,3.594C 0,3.594 0,3.09895833581686 0,3"> + <objectAnimator + android:duration="83" + android:propertyName="translateY" + android:startOffset="467" + android:valueFrom="25.368" + android:valueTo="23.993" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.388,0 0.228,1 1.0,1.0" /> </aapt:attr> </objectAnimator> </set> @@ -106,46 +129,70 @@ <target android:name="_R_G_L_1_G"> <aapt:attr name="android:animation"> <set android:ordering="together"> - <objectAnimator android:propertyName="scaleX" android:duration="450" - android:startOffset="0" android:valueFrom="1" android:valueTo="1" - android:valueType="floatType"> + <objectAnimator + android:duration="450" + android:propertyName="scaleX" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="1" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="450" - android:startOffset="0" android:valueFrom="1" android:valueTo="1" - android:valueType="floatType"> + <objectAnimator + android:duration="450" + android:propertyName="scaleY" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="1" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="67" - android:startOffset="450" android:valueFrom="1" - android:valueTo="1.1" android:valueType="floatType"> + <objectAnimator + android:duration="67" + android:propertyName="scaleX" + android:startOffset="450" + android:valueFrom="1" + android:valueTo="1.1" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="67" - android:startOffset="450" android:valueFrom="1" - android:valueTo="1.1" android:valueType="floatType"> + <objectAnimator + android:duration="67" + android:propertyName="scaleY" + android:startOffset="450" + android:valueFrom="1" + android:valueTo="1.1" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="183" - android:startOffset="517" android:valueFrom="1.1" - android:valueTo="1" android:valueType="floatType"> + <objectAnimator + android:duration="183" + android:propertyName="scaleX" + android:startOffset="517" + android:valueFrom="1.1" + android:valueTo="1" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="183" - android:startOffset="517" android:valueFrom="1.1" - android:valueTo="1" android:valueType="floatType"> + <objectAnimator + android:duration="183" + android:propertyName="scaleY" + android:startOffset="517" + android:valueFrom="1.1" + android:valueTo="1" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" /> </aapt:attr> </objectAnimator> </set> @@ -154,28 +201,37 @@ <target android:name="_R_G_L_1_G_N_4_T_1"> <aapt:attr name="android:animation"> <set android:ordering="together"> - <objectAnimator android:propertyName="translateXY" android:duration="400" - android:startOffset="0" android:propertyXName="translateX" - android:propertyYName="translateY" - android:pathData="M 0,3C 0,3.09895833581686 0,3 0,3"> + <objectAnimator + android:duration="400" + android:propertyName="translateY" + android:startOffset="0" + android:valueFrom="23.993" + android:valueTo="23.993" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.667,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="translateXY" android:duration="67" - android:startOffset="400" android:propertyXName="translateX" - android:propertyYName="translateY" - android:pathData="M 0,3C 0,3.09895833581686 0,3.594 0,3.594"> + <objectAnimator + android:duration="67" + android:propertyName="translateY" + android:startOffset="400" + android:valueFrom="23.993" + android:valueTo="25.368" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.58,0 0.549,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="translateXY" android:duration="83" - android:startOffset="467" android:propertyXName="translateX" - android:propertyYName="translateY" - android:pathData="M 0,3.594C 0,3.594 0,3.09895833581686 0,3"> + <objectAnimator + android:duration="83" + android:propertyName="translateY" + android:startOffset="467" + android:valueFrom="25.368" + android:valueTo="23.993" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.388,0 0.228,1 1.0,1.0" /> </aapt:attr> </objectAnimator> </set> @@ -184,64 +240,26 @@ <target android:name="_R_G_L_0_G_D_0_P_0"> <aapt:attr name="android:animation"> <set android:ordering="together"> - <objectAnimator android:propertyName="pathData" android:duration="317" - android:startOffset="0" - android:valueFrom="M79.79 -48.55 C79.79,-48.55 79.75,-53.75 79.78,-55.48 C79.83,-57.62 79.08,-78.36 53.07,-78.83 C29.5,-79.25 25.2,-59.38 25.22,-58.27 C25.25,-56.25 24.97,-31.17 24.97,-31.17 " - android:valueTo="M-27.97 -55.05 C-27.97,-55.05 -28,-60.25 -27.97,-61.98 C-27.92,-64.13 -23.5,-86.37 -0.75,-86.32 C22.77,-86.26 27.75,-65.87 27.72,-64.77 C27.55,-59.38 27.97,-31.67 27.97,-31.67 " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.974,0 0.458,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="133" - android:startOffset="317" - android:valueFrom="M-27.97 -55.05 C-27.97,-55.05 -28,-60.25 -27.97,-61.98 C-27.92,-64.13 -23.5,-86.37 -0.75,-86.32 C22.77,-86.26 27.75,-65.87 27.72,-64.77 C27.55,-59.38 27.97,-31.67 27.97,-31.67 " - android:valueTo="M-28.21 -28.42 C-28.21,-28.42 -27.85,-44.88 -27.97,-51.98 C-28,-54.13 -23.5,-76.37 -0.75,-76.32 C22.77,-76.26 27.75,-55.87 27.72,-54.77 C27.55,-49.38 27.97,-28.17 27.97,-28.17 " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="250" - android:startOffset="450" - android:valueFrom="M-28.21 -28.42 C-28.21,-28.42 -27.85,-44.88 -27.97,-51.98 C-28,-54.13 -23.5,-76.37 -0.75,-76.32 C22.77,-76.26 27.75,-55.87 27.72,-54.77 C27.55,-49.38 27.97,-28.17 27.97,-28.17 " - android:valueTo="M-28.21 -31.92 C-28.21,-31.92 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.97,-31.67 27.97,-31.67 " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.414,0 0.647,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="_R_G_L_0_G_D_1_P_0"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> - <objectAnimator android:propertyName="pathData" android:duration="317" - android:startOffset="0" - android:valueFrom="M79.79 -48.55 C79.79,-48.55 79.75,-53.75 79.78,-55.48 C79.83,-57.62 79.08,-78.36 53.07,-78.83 C29.5,-79.25 25.2,-59.38 25.22,-58.27 C25.25,-56.25 24.97,-31.17 24.97,-31.17 " - android:valueTo="M-27.97 -55.05 C-27.97,-55.05 -28,-60.25 -27.97,-61.98 C-27.92,-64.13 -23.5,-86.37 -0.75,-86.32 C22.77,-86.26 27.75,-65.87 27.72,-64.77 C27.55,-59.38 27.97,-31.67 27.97,-31.67 " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.974,0 0.458,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="133" - android:startOffset="317" - android:valueFrom="M-27.97 -55.05 C-27.97,-55.05 -28,-60.25 -27.97,-61.98 C-27.92,-64.13 -23.5,-86.37 -0.75,-86.32 C22.77,-86.26 27.75,-65.87 27.72,-64.77 C27.55,-59.38 27.97,-31.67 27.97,-31.67 " - android:valueTo="M-28.21 -28.42 C-28.21,-28.42 -27.85,-44.88 -27.97,-51.98 C-28,-54.13 -23.5,-76.37 -0.75,-76.32 C22.77,-76.26 27.75,-55.87 27.72,-54.77 C27.55,-49.38 27.97,-28.17 27.97,-28.17 " - android:valueType="pathType"> + <objectAnimator + android:duration="317" + android:propertyName="pathData" + android:startOffset="0" + android:valueFrom="M14.33 14.33 C14.33,14.33 14.32,9.42 14.32,9.42 C14.32,7.4 15.67,5.01 18.65,5 C21.76,4.99 23.07,7.37 23.05,9.47 C23.05,9.47 23.06,9.77 23.06,9.77 " + android:valueTo="M14.33 14.33 C14.33,14.33 14.29,6.17 14.29,6.17 C14.29,3.59 12.2,1.5 9.63,1.5 C7.05,1.5 4.96,3.59 4.96,6.17 C4.96,6.17 4.96,7.33 4.96,7.33 " + android:valueType="pathType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.692,0 0.298,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="250" - android:startOffset="450" - android:valueFrom="M-28.21 -28.42 C-28.21,-28.42 -27.85,-44.88 -27.97,-51.98 C-28,-54.13 -23.5,-76.37 -0.75,-76.32 C22.77,-76.26 27.75,-55.87 27.72,-54.77 C27.55,-49.38 27.97,-28.17 27.97,-28.17 " - android:valueTo="M-28.21 -31.92 C-28.21,-31.92 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.97,-31.67 27.97,-31.67 " - android:valueType="pathType"> + <objectAnimator + android:duration="133" + android:propertyName="pathData" + android:startOffset="317" + android:valueFrom="M14.33 14.33 C14.33,14.33 14.29,6.17 14.29,6.17 C14.29,3.59 12.2,1.5 9.63,1.5 C7.05,1.5 4.96,3.59 4.96,6.17 C4.96,6.17 4.96,7.33 4.96,7.33 " + android:valueTo="M14.33 14.33 C14.33,14.33 14.33,9.67 14.33,9.67 C14.33,7.09 12.24,5 9.67,5 C7.09,5 5,7.09 5,9.67 C5,9.67 5,14.33 5,14.33 " + android:valueType="pathType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.414,0 0.647,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.561,0 0.44,1 1.0,1.0" /> </aapt:attr> </objectAnimator> </set> @@ -250,28 +268,37 @@ <target android:name="_R_G_L_0_G_N_4_T_1"> <aapt:attr name="android:animation"> <set android:ordering="together"> - <objectAnimator android:propertyName="translateXY" android:duration="400" - android:startOffset="0" android:propertyXName="translateX" - android:propertyYName="translateY" - android:pathData="M 0,3C 0,3.09895833581686 0,3 0,3"> + <objectAnimator + android:duration="400" + android:propertyName="translateY" + android:startOffset="0" + android:valueFrom="23.993" + android:valueTo="23.993" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.667,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="translateXY" android:duration="67" - android:startOffset="400" android:propertyXName="translateX" - android:propertyYName="translateY" - android:pathData="M 0,3C 0,3.09895833581686 0,3.594 0,3.594"> + <objectAnimator + android:duration="67" + android:propertyName="translateY" + android:startOffset="400" + android:valueFrom="23.993" + android:valueTo="25.368" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.58,0 0.549,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="translateXY" android:duration="83" - android:startOffset="467" android:propertyXName="translateX" - android:propertyYName="translateY" - android:pathData="M 0,3.594C 0,3.594 0,3.09895833581686 0,3"> + <objectAnimator + android:duration="83" + android:propertyName="translateY" + android:startOffset="467" + android:valueFrom="25.368" + android:valueTo="23.993" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.388,0 0.228,1 1.0,1.0" /> </aapt:attr> </objectAnimator> </set> @@ -280,9 +307,13 @@ <target android:name="time_group"> <aapt:attr name="android:animation"> <set android:ordering="together"> - <objectAnimator android:propertyName="translateX" android:duration="717" - android:startOffset="0" android:valueFrom="0" android:valueTo="1" - android:valueType="floatType"/> + <objectAnimator + android:duration="717" + android:propertyName="translateX" + android:startOffset="0" + android:valueFrom="0" + android:valueTo="1" + android:valueType="floatType" /> </set> </aapt:attr> </target> diff --git a/data/res/anim/lock_scanning.xml b/data/res/anim/lock_scanning.xml index 8ced02b..db7972f 100644 --- a/data/res/anim/lock_scanning.xml +++ b/data/res/anim/lock_scanning.xml @@ -1,5 +1,4 @@ -<!-- - Copyright (C) 2019 The Android Open Source Project +<!-- Copyright (C) 2019 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. @@ -19,52 +18,36 @@ <vector android:height="42dp" android:width="32dp" android:viewportHeight="42" android:viewportWidth="32"> <group android:name="_R_G"> - <group android:name="_R_G_L_2_G_N_5_N_1_T_0" android:translateY="5" - android:pivotX="16" android:pivotY="16" android:scaleX="2" - android:scaleY="2"> - <group android:name="_R_G_L_2_G_N_5_T_0" android:translateX="7.75" - android:translateY="10.670000000000002" android:pivotX="8.25" - android:pivotY="7.25" android:scaleX="0.64" android:scaleY="0.64"> - <group android:name="_R_G_L_2_G" android:translateX="6" - android:translateY="5" android:pivotX="2.25" android:pivotY="2.25" - android:scaleX="1" android:scaleY="1"> - <path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="#000" - android:fillAlpha="1" android:fillType="nonZero" - android:pathData=" M2.25 0.25 C3.35,0.25 4.25,1.15 4.25,2.25 C4.25,3.35 3.35,4.25 2.25,4.25 C1.15,4.25 0.25,3.35 0.25,2.25 C0.25,1.15 1.15,0.25 2.25,0.25c "/> - </group> - </group> + <group android:name="_R_G_L_2_G" android:translateX="1.6669999999999998" + android:translateY="11.992999999999999" android:pivotX="14.333" + android:pivotY="13" android:scaleX="1" android:scaleY="1"> + <path android:name="_R_G_L_2_G_D_0_P_0" android:strokeColor="#ffffff" + android:strokeLineCap="round" android:strokeLineJoin="round" + android:strokeWidth="2" android:strokeAlpha="1" + android:pathData=" M22.33 21 C22.33,21 6.33,21 6.33,21 C5.6,21 5,20.4 5,19.67 C5,19.67 5,6.33 5,6.33 C5,5.6 5.6,5 6.33,5 C6.33,5 22.33,5 22.33,5 C23.07,5 23.67,5.6 23.67,6.33 C23.67,6.33 23.67,19.67 23.67,19.67 C23.67,20.4 23.07,21 22.33,21c "/> </group> - <group android:name="_R_G_L_1_G_N_5_N_1_T_0" android:translateY="5" - android:pivotX="16" android:pivotY="16" android:scaleX="2" - android:scaleY="2"> - <group android:name="_R_G_L_1_G_N_5_T_0" android:translateX="7.75" - android:translateY="10.670000000000002" android:pivotX="8.25" - android:pivotY="7.25" android:scaleX="0.64" android:scaleY="0.64"> - <group android:name="_R_G_L_1_G_T_1" android:translateX="8.25" - android:translateY="1.121" android:scaleX="0.125" - android:scaleY="0.125"> - <group android:name="_R_G_L_1_G" android:translateY="25.029"> - <path android:name="_R_G_L_1_G_D_0_P_0" - android:strokeColor="#000" android:strokeLineCap="round" - android:strokeLineJoin="round" android:strokeWidth="16" - android:strokeAlpha="1" - android:pathData=" M-28.21 -25.03 C-28.21,-25.03 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.93,-26.15 27.93,-26.15 "/> - </group> - </group> + <group android:name="_R_G_L_1_G_N_7_T_0" android:translateX="1.6669999999999998" + android:translateY="11.992999999999999" android:pivotX="14.333" + android:pivotY="13" android:scaleX="1" android:scaleY="1"> + <group android:name="_R_G_L_1_G" android:translateX="11.583" + android:translateY="10.257" android:pivotX="2.75" android:pivotY="2.75" + android:scaleX="1" android:scaleY="1"> + <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="#ffffff" + android:fillAlpha="1" android:fillType="nonZero" + android:pathData=" M2.75 0.25 C4.13,0.25 5.25,1.37 5.25,2.75 C5.25,4.13 4.13,5.25 2.75,5.25 C1.37,5.25 0.25,4.13 0.25,2.75 C0.25,1.37 1.37,0.25 2.75,0.25c "/> </group> </group> - <group android:name="_R_G_L_0_G_N_5_N_1_T_0" android:translateY="5" - android:pivotX="16" android:pivotY="16" android:scaleX="2" - android:scaleY="2"> - <group android:name="_R_G_L_0_G_N_5_T_0" android:translateX="7.75" - android:translateY="10.670000000000002" android:pivotX="8.25" - android:pivotY="7.25" android:scaleX="0.64" android:scaleY="0.64"> - <group android:name="_R_G_L_0_G" android:translateY="0.04699999999999971" - android:pivotX="8.25" android:pivotY="7.25" android:scaleX="1.01562" - android:scaleY="1.01563"> - <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="#000" - android:fillAlpha="1" android:fillType="nonZero" - android:pathData=" M14.25 0.25 C14.25,0.25 12.75,0.25 12.75,0.25 C12.75,0.25 10.75,0.25 10.75,0.25 C10.75,0.25 5.75,0.25 5.75,0.25 C5.75,0.25 3.75,0.25 3.75,0.25 C3.75,0.25 2.25,0.25 2.25,0.25 C1.15,0.25 0.25,1.15 0.25,2.25 C0.25,2.25 0.25,12.25 0.25,12.25 C0.25,13.35 1.15,14.25 2.25,14.25 C2.25,14.25 14.25,14.25 14.25,14.25 C15.35,14.25 16.25,13.35 16.25,12.25 C16.25,12.25 16.25,2.25 16.25,2.25 C16.25,1.15 15.35,0.25 14.25,0.25c M14.25 12.25 C14.25,12.25 2.25,12.25 2.25,12.25 C2.25,12.25 2.25,2.25 2.25,2.25 C2.25,2.25 3.75,2.25 3.75,2.25 C3.75,2.25 12.75,2.25 12.75,2.25 C12.75,2.25 14.25,2.25 14.25,2.25 C14.25,2.25 14.25,12.25 14.25,12.25c "/> + <group android:name="_R_G_L_0_G_N_7_T_0" android:translateX="1.6669999999999998" + android:translateY="11.992999999999999" android:pivotX="14.333" + android:pivotY="13" android:scaleX="1" android:scaleY="1"> + <group android:name="_R_G_L_0_G_T_1" android:translateX="14.333" + android:translateY="0.34"> + <group android:name="_R_G_L_0_G" android:translateX="-9.667" + android:translateY="-9.667"> + <path android:name="_R_G_L_0_G_D_0_P_0" android:strokeColor="#ffffff" + android:strokeLineCap="round" android:strokeLineJoin="round" + android:strokeWidth="2" android:strokeAlpha="1" + android:pathData=" M14.33 14.33 C14.33,14.33 14.33,9.67 14.33,9.67 C14.33,7.09 12.24,5 9.67,5 C7.09,5 5,7.09 5,9.67 C5,9.67 5,14.33 5,14.33 "/> </group> </group> </group> @@ -75,6 +58,68 @@ <target android:name="_R_G_L_2_G"> <aapt:attr name="android:animation"> <set android:ordering="together"> + <objectAnimator android:propertyName="scaleX" android:duration="83" + android:startOffset="0" android:valueFrom="1" android:valueTo="1" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> + </aapt:attr> + </objectAnimator> + <objectAnimator android:propertyName="scaleY" android:duration="83" + android:startOffset="0" android:valueFrom="1" android:valueTo="1" + android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> + </aapt:attr> + </objectAnimator> + <objectAnimator android:propertyName="scaleX" android:duration="83" + android:startOffset="83" android:valueFrom="1" + android:valueTo="0.96" android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> + </aapt:attr> + </objectAnimator> + <objectAnimator android:propertyName="scaleY" android:duration="83" + android:startOffset="83" android:valueFrom="1" + android:valueTo="0.96" android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> + </aapt:attr> + </objectAnimator> + <objectAnimator android:propertyName="scaleX" android:duration="183" + android:startOffset="167" android:valueFrom="0.96" + android:valueTo="1.28" android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> + </aapt:attr> + </objectAnimator> + <objectAnimator android:propertyName="scaleY" android:duration="183" + android:startOffset="167" android:valueFrom="0.96" + android:valueTo="1.28" android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> + </aapt:attr> + </objectAnimator> + <objectAnimator android:propertyName="scaleX" android:duration="250" + android:startOffset="350" android:valueFrom="1.28" + android:valueTo="1" android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> + </aapt:attr> + </objectAnimator> + <objectAnimator android:propertyName="scaleY" android:duration="250" + android:startOffset="350" android:valueFrom="1.28" + android:valueTo="1" android:valueType="floatType"> + <aapt:attr name="android:interpolator"> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> + </aapt:attr> + </objectAnimator> + </set> + </aapt:attr> + </target> + <target android:name="_R_G_L_1_G"> + <aapt:attr name="android:animation"> + <set android:ordering="together"> <objectAnimator android:propertyName="scaleX" android:duration="150" android:startOffset="0" android:valueFrom="1" android:valueTo="1" android:valueType="floatType"> @@ -120,61 +165,61 @@ </set> </aapt:attr> </target> - <target android:name="_R_G_L_2_G_N_5_T_0"> + <target android:name="_R_G_L_1_G_N_7_T_0"> <aapt:attr name="android:animation"> <set android:ordering="together"> <objectAnimator android:propertyName="scaleX" android:duration="83" - android:startOffset="0" android:valueFrom="0.64" - android:valueTo="0.64" android:valueType="floatType"> + android:startOffset="0" android:valueFrom="1" android:valueTo="1" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> </aapt:attr> </objectAnimator> <objectAnimator android:propertyName="scaleY" android:duration="83" - android:startOffset="0" android:valueFrom="0.64" - android:valueTo="0.64" android:valueType="floatType"> + android:startOffset="0" android:valueFrom="1" android:valueTo="1" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> </aapt:attr> </objectAnimator> <objectAnimator android:propertyName="scaleX" android:duration="83" - android:startOffset="83" android:valueFrom="0.64" - android:valueTo="0.62" android:valueType="floatType"> + android:startOffset="83" android:valueFrom="1" + android:valueTo="0.96" android:valueType="floatType"> <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> </aapt:attr> </objectAnimator> <objectAnimator android:propertyName="scaleY" android:duration="83" - android:startOffset="83" android:valueFrom="0.64" - android:valueTo="0.62" android:valueType="floatType"> + android:startOffset="83" android:valueFrom="1" + android:valueTo="0.96" android:valueType="floatType"> <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> </aapt:attr> </objectAnimator> <objectAnimator android:propertyName="scaleX" android:duration="183" - android:startOffset="167" android:valueFrom="0.62" - android:valueTo="0.8" android:valueType="floatType"> + android:startOffset="167" android:valueFrom="0.96" + android:valueTo="1.28" android:valueType="floatType"> <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> </aapt:attr> </objectAnimator> <objectAnimator android:propertyName="scaleY" android:duration="183" - android:startOffset="167" android:valueFrom="0.62" - android:valueTo="0.8" android:valueType="floatType"> + android:startOffset="167" android:valueFrom="0.96" + android:valueTo="1.28" android:valueType="floatType"> <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> </aapt:attr> </objectAnimator> <objectAnimator android:propertyName="scaleX" android:duration="250" - android:startOffset="350" android:valueFrom="0.8" - android:valueTo="0.64" android:valueType="floatType"> + android:startOffset="350" android:valueFrom="1.28" + android:valueTo="1" android:valueType="floatType"> <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> </aapt:attr> </objectAnimator> <objectAnimator android:propertyName="scaleY" android:duration="250" - android:startOffset="350" android:valueFrom="0.8" - android:valueTo="0.64" android:valueType="floatType"> + android:startOffset="350" android:valueFrom="1.28" + android:valueTo="1" android:valueType="floatType"> <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> </aapt:attr> @@ -182,13 +227,13 @@ </set> </aapt:attr> </target> - <target android:name="_R_G_L_1_G_D_0_P_0"> + <target android:name="_R_G_L_0_G_D_0_P_0"> <aapt:attr name="android:animation"> <set android:ordering="together"> <objectAnimator android:propertyName="pathData" android:duration="83" android:startOffset="0" - android:valueFrom="M-28.21 -25.03 C-28.21,-25.03 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.93,-26.15 27.93,-26.15 " - android:valueTo="M-28.21 -25.03 C-28.21,-25.03 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.93,-26.15 27.93,-26.15 " + android:valueFrom="M14.33 14.33 C14.33,14.33 14.33,9.67 14.33,9.67 C14.33,7.09 12.24,5 9.67,5 C7.09,5 5,7.09 5,9.67 C5,9.67 5,14.33 5,14.33 " + android:valueTo="M14.33 14.33 C14.33,14.33 14.33,9.67 14.33,9.67 C14.33,7.09 12.24,5 9.67,5 C7.09,5 5,7.09 5,9.67 C5,9.67 5,14.33 5,14.33 " android:valueType="pathType"> <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> @@ -196,8 +241,8 @@ </objectAnimator> <objectAnimator android:propertyName="pathData" android:duration="150" android:startOffset="83" - android:valueFrom="M-28.21 -25.03 C-28.21,-25.03 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.93,-26.15 27.93,-26.15 " - android:valueTo="M-28.02 -43.42 C-28.02,-43.42 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.76,-43.67 27.76,-43.67 " + android:valueFrom="M14.33 14.33 C14.33,14.33 14.33,9.67 14.33,9.67 C14.33,7.09 12.24,5 9.67,5 C7.09,5 5,7.09 5,9.67 C5,9.67 5,14.33 5,14.33 " + android:valueTo="M14.31 10.37 C14.31,10.37 14.33,9.67 14.33,9.67 C14.33,7.09 12.24,5 9.67,5 C7.09,5 5,7.09 5,9.67 C5,9.67 4.97,10.37 4.97,10.37 " android:valueType="pathType"> <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> @@ -205,8 +250,8 @@ </objectAnimator> <objectAnimator android:propertyName="pathData" android:duration="117" android:startOffset="233" - android:valueFrom="M-28.02 -43.42 C-28.02,-43.42 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.76,-43.67 27.76,-43.67 " - android:valueTo="M-28.21 -25.03 C-28.21,-25.03 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.93,-26.15 27.93,-26.15 " + android:valueFrom="M14.31 10.37 C14.31,10.37 14.33,9.67 14.33,9.67 C14.33,7.09 12.24,5 9.67,5 C7.09,5 5,7.09 5,9.67 C5,9.67 4.97,10.37 4.97,10.37 " + android:valueTo="M14.33 14.33 C14.33,14.33 14.33,9.67 14.33,9.67 C14.33,7.09 12.24,5 9.67,5 C7.09,5 5,7.09 5,9.67 C5,9.67 5,14.33 5,14.33 " android:valueType="pathType"> <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> @@ -215,150 +260,88 @@ </set> </aapt:attr> </target> - <target android:name="_R_G_L_1_G_T_1"> + <target android:name="_R_G_L_0_G_T_1"> <aapt:attr name="android:animation"> <set android:ordering="together"> <objectAnimator android:propertyName="translateY" android:duration="83" - android:startOffset="0" android:valueFrom="1.121" - android:valueTo="1.121" android:valueType="floatType"> + android:startOffset="0" android:valueFrom="0.34" + android:valueTo="0.34" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.384,0 0.536,1 1.0,1.0"/> </aapt:attr> </objectAnimator> <objectAnimator android:propertyName="translateY" android:duration="150" - android:startOffset="83" android:valueFrom="1.121" - android:valueTo="3.749" android:valueType="floatType"> + android:startOffset="83" android:valueFrom="0.34" + android:valueTo="4.364" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.384,0 0.536,1 1.0,1.0"/> </aapt:attr> </objectAnimator> <objectAnimator android:propertyName="translateY" android:duration="117" - android:startOffset="233" android:valueFrom="3.749" - android:valueTo="1.121" android:valueType="floatType"> + android:startOffset="233" android:valueFrom="4.364" + android:valueTo="0.34" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.442,0 0.594,1 1.0,1.0"/> </aapt:attr> </objectAnimator> </set> </aapt:attr> </target> - <target android:name="_R_G_L_1_G_N_5_T_0"> + <target android:name="_R_G_L_0_G_N_7_T_0"> <aapt:attr name="android:animation"> <set android:ordering="together"> <objectAnimator android:propertyName="scaleX" android:duration="83" - android:startOffset="0" android:valueFrom="0.64" - android:valueTo="0.64" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="83" - android:startOffset="0" android:valueFrom="0.64" - android:valueTo="0.64" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="83" - android:startOffset="83" android:valueFrom="0.64" - android:valueTo="0.62" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="83" - android:startOffset="83" android:valueFrom="0.64" - android:valueTo="0.62" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="183" - android:startOffset="167" android:valueFrom="0.62" - android:valueTo="0.8" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="183" - android:startOffset="167" android:valueFrom="0.62" - android:valueTo="0.8" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="250" - android:startOffset="350" android:valueFrom="0.8" - android:valueTo="0.64" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="250" - android:startOffset="350" android:valueFrom="0.8" - android:valueTo="0.64" android:valueType="floatType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="_R_G_L_0_G_N_5_T_0"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> - <objectAnimator android:propertyName="scaleX" android:duration="83" - android:startOffset="0" android:valueFrom="0.64" - android:valueTo="0.64" android:valueType="floatType"> + android:startOffset="0" android:valueFrom="1" android:valueTo="1" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> </aapt:attr> </objectAnimator> <objectAnimator android:propertyName="scaleY" android:duration="83" - android:startOffset="0" android:valueFrom="0.64" - android:valueTo="0.64" android:valueType="floatType"> + android:startOffset="0" android:valueFrom="1" android:valueTo="1" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> </aapt:attr> </objectAnimator> <objectAnimator android:propertyName="scaleX" android:duration="83" - android:startOffset="83" android:valueFrom="0.64" - android:valueTo="0.62" android:valueType="floatType"> + android:startOffset="83" android:valueFrom="1" + android:valueTo="0.96" android:valueType="floatType"> <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> </aapt:attr> </objectAnimator> <objectAnimator android:propertyName="scaleY" android:duration="83" - android:startOffset="83" android:valueFrom="0.64" - android:valueTo="0.62" android:valueType="floatType"> + android:startOffset="83" android:valueFrom="1" + android:valueTo="0.96" android:valueType="floatType"> <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> </aapt:attr> </objectAnimator> <objectAnimator android:propertyName="scaleX" android:duration="183" - android:startOffset="167" android:valueFrom="0.62" - android:valueTo="0.8" android:valueType="floatType"> + android:startOffset="167" android:valueFrom="0.96" + android:valueTo="1.28" android:valueType="floatType"> <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> </aapt:attr> </objectAnimator> <objectAnimator android:propertyName="scaleY" android:duration="183" - android:startOffset="167" android:valueFrom="0.62" - android:valueTo="0.8" android:valueType="floatType"> + android:startOffset="167" android:valueFrom="0.96" + android:valueTo="1.28" android:valueType="floatType"> <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> </aapt:attr> </objectAnimator> <objectAnimator android:propertyName="scaleX" android:duration="250" - android:startOffset="350" android:valueFrom="0.8" - android:valueTo="0.64" android:valueType="floatType"> + android:startOffset="350" android:valueFrom="1.28" + android:valueTo="1" android:valueType="floatType"> <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> </aapt:attr> </objectAnimator> <objectAnimator android:propertyName="scaleY" android:duration="250" - android:startOffset="350" android:valueFrom="0.8" - android:valueTo="0.64" android:valueType="floatType"> + android:startOffset="350" android:valueFrom="1.28" + android:valueTo="1" android:valueType="floatType"> <aapt:attr name="android:interpolator"> <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/> </aapt:attr> @@ -369,7 +352,7 @@ <target android:name="time_group"> <aapt:attr name="android:animation"> <set android:ordering="together"> - <objectAnimator android:propertyName="translateX" android:duration="1000" + <objectAnimator android:propertyName="translateX" android:duration="717" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/> </set> diff --git a/data/res/anim/lock_to_error.xml b/data/res/anim/lock_to_error.xml index afe2290..e356f26 100644 --- a/data/res/anim/lock_to_error.xml +++ b/data/res/anim/lock_to_error.xml @@ -1,5 +1,4 @@ -<!-- - Copyright (C) 2019 The Android Open Source Project +<!-- Copyright (C) 2019 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. @@ -19,161 +18,157 @@ <vector android:height="32dp" android:width="32dp" android:viewportHeight="32" android:viewportWidth="32"> <group android:name="_R_G"> - <group android:name="_R_G_L_2_G_N_2_T_0" android:translateX="7.75" - android:translateY="12.649999999999999" android:pivotX="8.25" - android:pivotY="7.25" android:rotation="0" android:scaleX="1.3" - android:scaleY="1.3"> - <group android:name="_R_G_L_2_G" android:translateX="6" - android:translateY="4.954" android:pivotX="2.25" android:pivotY="2.25" - android:scaleX="0.98462" android:scaleY="0.98462"> - <path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="#000" + <group android:name="_R_G_L_2_G" android:translateX="1.6669999999999998" + android:translateY="6.9929999999999986" android:pivotX="14.333" + android:pivotY="13" android:rotation="0"> + <path android:name="_R_G_L_2_G_D_0_P_0" android:strokeColor="#ffffff" + android:strokeLineCap="round" android:strokeLineJoin="round" + android:strokeWidth="2" android:strokeAlpha="1" + android:pathData=" M22.33 21 C22.33,21 6.33,21 6.33,21 C5.6,21 5,20.4 5,19.67 C5,19.67 5,6.33 5,6.33 C5,5.6 5.6,5 6.33,5 C6.33,5 22.33,5 22.33,5 C23.07,5 23.67,5.6 23.67,6.33 C23.67,6.33 23.67,19.67 23.67,19.67 C23.67,20.4 23.07,21 22.33,21c "/> + </group> + <group android:name="_R_G_L_1_G_N_4_T_0" android:translateX="1.6669999999999998" + android:translateY="6.9929999999999986" android:pivotX="14.333" + android:pivotY="13" android:rotation="0"> + <group android:name="_R_G_L_1_G" android:translateX="11.583" + android:translateY="10.257"> + <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="#ffffff" android:fillAlpha="1" android:fillType="nonZero" - android:pathData=" M2.25 0.25 C3.35,0.25 4.25,1.15 4.25,2.25 C4.25,3.35 3.35,4.25 2.25,4.25 C1.15,4.25 0.25,3.35 0.25,2.25 C0.25,1.15 1.15,0.25 2.25,0.25c "/> + android:pathData=" M2.75 0.25 C4.13,0.25 5.25,1.37 5.25,2.75 C5.25,4.13 4.13,5.25 2.75,5.25 C1.37,5.25 0.25,4.13 0.25,2.75 C0.25,1.37 1.37,0.25 2.75,0.25c "/> </group> </group> - <group android:name="_R_G_L_1_G_N_2_T_0" android:translateX="7.75" - android:translateY="12.649999999999999" android:pivotX="8.25" - android:pivotY="7.25" android:rotation="0" android:scaleX="1.3" - android:scaleY="1.3"> - <group android:name="_R_G_L_1_G" android:translateX="-16.273" - android:translateY="32.312" android:pivotX="27.965" android:pivotY="-32" - android:scaleX="0.12308" android:scaleY="0.12308"> - <path android:name="_R_G_L_1_G_D_0_P_0" android:strokeColor="#000" + <group android:name="_R_G_L_0_G_N_4_T_0" android:translateX="1.6669999999999998" + android:translateY="6.9929999999999986" android:pivotX="14.333" + android:pivotY="13" android:rotation="0"> + <group android:name="_R_G_L_0_G" android:translateX="4.666" + android:translateY="-9.327"> + <path android:name="_R_G_L_0_G_D_0_P_0" android:strokeColor="#ffffff" android:strokeLineCap="round" android:strokeLineJoin="round" - android:strokeWidth="16" android:strokeAlpha="1" - android:pathData=" M-28.21 -25.03 C-28.21,-25.03 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.93,-26.15 27.93,-26.15 "/> + android:strokeWidth="2" android:strokeAlpha="1" + android:pathData=" M14.33 14.33 C14.33,14.33 14.33,9.67 14.33,9.67 C14.33,7.09 12.24,5 9.67,5 C7.09,5 5,7.09 5,9.67 C5,9.67 5,14.33 5,14.33 "/> </group> </group> - <group android:name="_R_G_L_0_G" android:translateX="7.75" - android:translateY="12.649999999999999" android:pivotX="8.25" - android:pivotY="7.25" android:rotation="0" android:scaleX="1.3" - android:scaleY="1.3"> - <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="#000" - android:fillAlpha="1" android:fillType="nonZero" - android:pathData=" M14.25 0.25 C14.25,0.25 12.75,0.25 12.75,0.25 C12.75,0.25 10.75,0.25 10.75,0.25 C10.75,0.25 5.75,0.25 5.75,0.25 C5.75,0.25 3.75,0.25 3.75,0.25 C3.75,0.25 2.25,0.25 2.25,0.25 C1.15,0.25 0.25,1.15 0.25,2.25 C0.25,2.25 0.25,12.25 0.25,12.25 C0.25,13.35 1.15,14.25 2.25,14.25 C2.25,14.25 14.25,14.25 14.25,14.25 C15.35,14.25 16.25,13.35 16.25,12.25 C16.25,12.25 16.25,2.25 16.25,2.25 C16.25,1.15 15.35,0.25 14.25,0.25c M14.25 12.25 C14.25,12.25 2.25,12.25 2.25,12.25 C2.25,12.25 2.25,2.25 2.25,2.25 C2.25,2.25 3.75,2.25 3.75,2.25 C3.75,2.25 12.75,2.25 12.75,2.25 C12.75,2.25 14.25,2.25 14.25,2.25 C14.25,2.25 14.25,12.25 14.25,12.25c "/> - </group> </group> <group android:name="time_group"/> </vector> </aapt:attr> - <target android:name="_R_G_L_2_G_N_2_T_0"> + <target android:name="_R_G_L_2_G"> <aapt:attr name="android:animation"> <set android:ordering="together"> <objectAnimator android:propertyName="rotation" android:duration="133" android:startOffset="0" android:valueFrom="0" android:valueTo="0" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.44,0 0.601,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.465,0 0.558,1 1.0,1.0"/> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="rotation" android:duration="120" + <objectAnimator android:propertyName="rotation" android:duration="117" android:startOffset="133" android:valueFrom="0" android:valueTo="-10" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.44,0 0.601,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.465,0 0.558,1 1.0,1.0"/> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="rotation" android:duration="97" - android:startOffset="253" android:valueFrom="-10" + <objectAnimator android:propertyName="rotation" android:duration="100" + android:startOffset="250" android:valueFrom="-10" android:valueTo="10" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.531,0 0.389,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.51,0 0.531,1 1.0,1.0"/> </aapt:attr> </objectAnimator> <objectAnimator android:propertyName="rotation" android:duration="100" android:startOffset="350" android:valueFrom="10" android:valueTo="-5" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.499,0 0.489,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.469,0 0.599,1 1.0,1.0"/> </aapt:attr> </objectAnimator> <objectAnimator android:propertyName="rotation" android:duration="167" android:startOffset="450" android:valueFrom="-5" android:valueTo="0" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.293,0 0.689,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.384,0 0.565,1 1.0,1.0"/> </aapt:attr> </objectAnimator> </set> </aapt:attr> </target> - <target android:name="_R_G_L_1_G_N_2_T_0"> + <target android:name="_R_G_L_1_G_N_4_T_0"> <aapt:attr name="android:animation"> <set android:ordering="together"> <objectAnimator android:propertyName="rotation" android:duration="133" android:startOffset="0" android:valueFrom="0" android:valueTo="0" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.44,0 0.601,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.465,0 0.558,1 1.0,1.0"/> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="rotation" android:duration="120" + <objectAnimator android:propertyName="rotation" android:duration="117" android:startOffset="133" android:valueFrom="0" android:valueTo="-10" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.44,0 0.601,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.465,0 0.558,1 1.0,1.0"/> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="rotation" android:duration="97" - android:startOffset="253" android:valueFrom="-10" + <objectAnimator android:propertyName="rotation" android:duration="100" + android:startOffset="250" android:valueFrom="-10" android:valueTo="10" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.531,0 0.389,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.51,0 0.531,1 1.0,1.0"/> </aapt:attr> </objectAnimator> <objectAnimator android:propertyName="rotation" android:duration="100" android:startOffset="350" android:valueFrom="10" android:valueTo="-5" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.499,0 0.489,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.469,0 0.599,1 1.0,1.0"/> </aapt:attr> </objectAnimator> <objectAnimator android:propertyName="rotation" android:duration="167" android:startOffset="450" android:valueFrom="-5" android:valueTo="0" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.293,0 0.689,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.384,0 0.565,1 1.0,1.0"/> </aapt:attr> </objectAnimator> </set> </aapt:attr> </target> - <target android:name="_R_G_L_0_G"> + <target android:name="_R_G_L_0_G_N_4_T_0"> <aapt:attr name="android:animation"> <set android:ordering="together"> <objectAnimator android:propertyName="rotation" android:duration="133" android:startOffset="0" android:valueFrom="0" android:valueTo="0" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.44,0 0.601,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.465,0 0.558,1 1.0,1.0"/> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="rotation" android:duration="120" + <objectAnimator android:propertyName="rotation" android:duration="117" android:startOffset="133" android:valueFrom="0" android:valueTo="-10" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.44,0 0.601,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.465,0 0.558,1 1.0,1.0"/> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="rotation" android:duration="97" - android:startOffset="253" android:valueFrom="-10" + <objectAnimator android:propertyName="rotation" android:duration="100" + android:startOffset="250" android:valueFrom="-10" android:valueTo="10" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.531,0 0.389,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.51,0 0.531,1 1.0,1.0"/> </aapt:attr> </objectAnimator> <objectAnimator android:propertyName="rotation" android:duration="100" android:startOffset="350" android:valueFrom="10" android:valueTo="-5" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.499,0 0.489,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.469,0 0.599,1 1.0,1.0"/> </aapt:attr> </objectAnimator> <objectAnimator android:propertyName="rotation" android:duration="167" android:startOffset="450" android:valueFrom="-5" android:valueTo="0" android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.293,0 0.689,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.384,0 0.565,1 1.0,1.0"/> </aapt:attr> </objectAnimator> </set> @@ -182,7 +177,7 @@ <target android:name="time_group"> <aapt:attr name="android:animation"> <set android:ordering="together"> - <objectAnimator android:propertyName="translateX" android:duration="1000" + <objectAnimator android:propertyName="translateX" android:duration="717" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/> </set> diff --git a/data/res/anim/lock_unlock.xml b/data/res/anim/lock_unlock.xml index c8b2608..91d4432 100644 --- a/data/res/anim/lock_unlock.xml +++ b/data/res/anim/lock_unlock.xml @@ -1,5 +1,4 @@ -<!-- - Copyright (C) 2019 The Android Open Source Project +<!-- Copyright (C) 2019 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. @@ -14,85 +13,114 @@ limitations under the License. --> <animated-vector xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:aapt="http://schemas.android.com/aapt"> + xmlns:aapt="http://schemas.android.com/aapt"> <aapt:attr name="android:drawable"> - <vector android:height="40dp" android:width="32dp" android:viewportHeight="40" - android:viewportWidth="32"> + <vector + android:width="32dp" + android:height="42dp" + android:viewportWidth="32" + android:viewportHeight="42"> <group android:name="_R_G"> - <group android:name="_R_G_L_2_G_N_1_T_0" android:translateX="16" - android:translateY="20" android:scaleX="1.3" android:scaleY="1.3"> - <group android:name="_R_G_L_2_G_T_1" android:translateY="3"> - <group android:name="_R_G_L_2_G" android:translateX="-8.25" - android:translateY="-7.25"> - <path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="#000" - android:fillAlpha="1" android:fillType="nonZero" - android:pathData=" M14.25 0.25 C14.25,0.25 12.75,0.25 12.75,0.25 C12.75,0.25 10.75,0.25 10.75,0.25 C10.75,0.25 5.75,0.25 5.75,0.25 C5.75,0.25 3.75,0.25 3.75,0.25 C3.75,0.25 2.25,0.25 2.25,0.25 C1.15,0.25 0.25,1.15 0.25,2.25 C0.25,2.25 0.25,12.25 0.25,12.25 C0.25,13.35 1.15,14.25 2.25,14.25 C2.25,14.25 14.25,14.25 14.25,14.25 C15.35,14.25 16.25,13.35 16.25,12.25 C16.25,12.25 16.25,2.25 16.25,2.25 C16.25,1.15 15.35,0.25 14.25,0.25c M14.25 12.25 C14.25,12.25 2.25,12.25 2.25,12.25 C2.25,12.25 2.25,2.25 2.25,2.25 C2.25,2.25 3.75,2.25 3.75,2.25 C3.75,2.25 12.75,2.25 12.75,2.25 C12.75,2.25 14.25,2.25 14.25,2.25 C14.25,2.25 14.25,12.25 14.25,12.25c "/> - </group> + <group + android:name="_R_G_L_2_G_T_1" + android:translateX="16" + android:translateY="24.993"> + <group + android:name="_R_G_L_2_G" + android:translateX="-14.333" + android:translateY="-13"> + <path + android:name="_R_G_L_2_G_D_0_P_0" + android:pathData=" M22.33 21 C22.33,21 6.33,21 6.33,21 C5.6,21 5,20.4 5,19.67 C5,19.67 5,6.33 5,6.33 C5,5.6 5.6,5 6.33,5 C6.33,5 22.33,5 22.33,5 C23.07,5 23.67,5.6 23.67,6.33 C23.67,6.33 23.67,19.67 23.67,19.67 C23.67,20.4 23.07,21 22.33,21c " + android:strokeWidth="2" + android:strokeAlpha="1" + android:strokeColor="#ffffff" /> </group> </group> - <group android:name="_R_G_L_1_G_N_4_N_1_T_0" android:translateX="16" - android:translateY="20" android:scaleX="1.3" android:scaleY="1.3"> - <group android:name="_R_G_L_1_G_N_4_T_1" android:translateY="3"> - <group android:name="_R_G_L_1_G_N_4_T_0" android:translateX="-8.25" - android:translateY="-7.25"> - <group android:name="_R_G_L_1_G" android:translateX="6" - android:translateY="5" android:pivotX="2.25" - android:pivotY="2.25" android:scaleX="1" android:scaleY="1"> - <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="#000" - android:fillAlpha="1" android:fillType="nonZero" - android:pathData=" M2.25 0.25 C3.35,0.25 4.25,1.15 4.25,2.25 C4.25,3.35 3.35,4.25 2.25,4.25 C1.15,4.25 0.25,3.35 0.25,2.25 C0.25,1.15 1.15,0.25 2.25,0.25c "/> - </group> + <group + android:name="_R_G_L_1_G_N_4_T_1" + android:translateX="16" + android:translateY="24.993"> + <group + android:name="_R_G_L_1_G_N_4_T_0" + android:translateX="-14.333" + android:translateY="-13"> + <group + android:name="_R_G_L_1_G" + android:pivotX="2.75" + android:pivotY="2.75" + android:scaleX="1" + android:scaleY="1" + android:translateX="11.583" + android:translateY="10.257"> + <path + android:name="_R_G_L_1_G_D_0_P_0" + android:fillAlpha="1" + android:fillColor="#ffffff" + android:fillType="nonZero" + android:pathData=" M2.75 0.25 C4.13,0.25 5.25,1.37 5.25,2.75 C5.25,4.13 4.13,5.25 2.75,5.25 C1.37,5.25 0.25,4.13 0.25,2.75 C0.25,1.37 1.37,0.25 2.75,0.25c " /> </group> </group> </group> - <group android:name="_R_G_L_0_G_N_4_N_1_T_0" android:translateX="16" - android:translateY="20" android:scaleX="1.3" android:scaleY="1.3"> - <group android:name="_R_G_L_0_G_N_4_T_1" android:translateY="3"> - <group android:name="_R_G_L_0_G_N_4_T_0" android:translateX="-8.25" - android:translateY="-7.25"> - <group android:name="_R_G_L_0_G" android:translateX="-16.219" - android:translateY="32.25" android:pivotX="27.965" - android:pivotY="-32" android:scaleX="0.125" - android:scaleY="0.125"> - <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="#ff0000" - android:fillAlpha="0" android:fillType="nonZero" - android:pathData=" M-28.21 -31.92 C-28.21,-31.92 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.97,-31.67 27.97,-31.67 "/> - <path android:name="_R_G_L_0_G_D_1_P_0" - android:strokeColor="#000" android:strokeLineCap="round" - android:strokeLineJoin="round" android:strokeWidth="16" - android:strokeAlpha="1" - android:pathData=" M-28.21 -31.92 C-28.21,-31.92 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.97,-31.67 27.97,-31.67 "/> - </group> + <group + android:name="_R_G_L_0_G_N_4_T_1" + android:translateX="16" + android:translateY="24.993"> + <group + android:name="_R_G_L_0_G_N_4_T_0" + android:translateX="-14.333" + android:translateY="-13"> + <group + android:name="_R_G_L_0_G" + android:translateX="4.666" + android:translateY="-9.327"> + <path + android:name="_R_G_L_0_G_D_0_P_0" + android:pathData=" M14.33 14.33 C14.33,14.33 14.33,9.67 14.33,9.67 C14.33,7.09 12.24,5 9.67,5 C7.09,5 5,7.09 5,9.67 C5,9.67 5,14.33 5,14.33 " + android:strokeWidth="2" + android:strokeAlpha="1" + android:strokeColor="#ffffff" /> </group> </group> </group> </group> - <group android:name="time_group"/> + <group android:name="time_group" /> </vector> </aapt:attr> <target android:name="_R_G_L_2_G_T_1"> <aapt:attr name="android:animation"> <set android:ordering="together"> - <objectAnimator android:propertyName="translateY" android:duration="133" - android:startOffset="0" android:valueFrom="3" - android:valueTo="1.625" android:valueType="floatType"> + <objectAnimator + android:duration="133" + android:propertyName="translateY" + android:startOffset="0" + android:valueFrom="24.993" + android:valueTo="22.493" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.075,0.167 0.622,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.378,0 0.622,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="translateY" android:duration="133" - android:startOffset="133" android:valueFrom="1.625" - android:valueTo="3.699" android:valueType="floatType"> + <objectAnimator + android:duration="133" + android:propertyName="translateY" + android:startOffset="133" + android:valueFrom="22.493" + android:valueTo="25.993" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.352,0 0.717,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.41,0 0.616,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="translateY" android:duration="100" - android:startOffset="267" android:valueFrom="3.699" - android:valueTo="3" android:valueType="floatType"> + <objectAnimator + android:duration="100" + android:propertyName="translateY" + android:startOffset="267" + android:valueFrom="25.993" + android:valueTo="24.993" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.356,0 0.527,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.427,0 0.508,1 1.0,1.0" /> </aapt:attr> </objectAnimator> </set> @@ -101,32 +129,48 @@ <target android:name="_R_G_L_1_G"> <aapt:attr name="android:animation"> <set android:ordering="together"> - <objectAnimator android:propertyName="scaleX" android:duration="100" - android:startOffset="0" android:valueFrom="1" android:valueTo="0.85" - android:valueType="floatType"> + <objectAnimator + android:duration="100" + android:propertyName="scaleX" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0.8200000000000001" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.418,0 0.565,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="100" - android:startOffset="0" android:valueFrom="1" android:valueTo="0.85" - android:valueType="floatType"> + <objectAnimator + android:duration="100" + android:propertyName="scaleY" + android:startOffset="0" + android:valueFrom="1" + android:valueTo="0.8200000000000001" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.418,0 0.565,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="scaleX" android:duration="283" - android:startOffset="100" android:valueFrom="0.85" - android:valueTo="1" android:valueType="floatType"> + <objectAnimator + android:duration="283" + android:propertyName="scaleX" + android:startOffset="100" + android:valueFrom="0.8200000000000001" + android:valueTo="1" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.535,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="scaleY" android:duration="283" - android:startOffset="100" android:valueFrom="0.85" - android:valueTo="1" android:valueType="floatType"> + <objectAnimator + android:duration="283" + android:propertyName="scaleY" + android:startOffset="100" + android:valueFrom="0.8200000000000001" + android:valueTo="1" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.535,1 1.0,1.0" /> </aapt:attr> </objectAnimator> </set> @@ -135,26 +179,37 @@ <target android:name="_R_G_L_1_G_N_4_T_1"> <aapt:attr name="android:animation"> <set android:ordering="together"> - <objectAnimator android:propertyName="translateY" android:duration="133" - android:startOffset="0" android:valueFrom="3" - android:valueTo="1.625" android:valueType="floatType"> + <objectAnimator + android:duration="133" + android:propertyName="translateY" + android:startOffset="0" + android:valueFrom="24.993" + android:valueTo="22.493" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.075,0.167 0.622,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.378,0 0.622,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="translateY" android:duration="133" - android:startOffset="133" android:valueFrom="1.625" - android:valueTo="3.699" android:valueType="floatType"> + <objectAnimator + android:duration="133" + android:propertyName="translateY" + android:startOffset="133" + android:valueFrom="22.493" + android:valueTo="25.993" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.352,0 0.717,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.41,0 0.616,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="translateY" android:duration="100" - android:startOffset="267" android:valueFrom="3.699" - android:valueTo="3" android:valueType="floatType"> + <objectAnimator + android:duration="100" + android:propertyName="translateY" + android:startOffset="267" + android:valueFrom="25.993" + android:valueTo="24.993" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.356,0 0.527,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.427,0 0.508,1 1.0,1.0" /> </aapt:attr> </objectAnimator> </set> @@ -163,46 +218,26 @@ <target android:name="_R_G_L_0_G_D_0_P_0"> <aapt:attr name="android:animation"> <set android:ordering="together"> - <objectAnimator android:propertyName="pathData" android:duration="67" - android:startOffset="0" - android:valueFrom="M-28.21 -31.92 C-28.21,-31.92 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.97,-31.67 27.97,-31.67 " - android:valueTo="M-27.97 -59.3 C-27.97,-59.3 -28,-64.5 -27.97,-66.23 C-27.92,-68.37 -23.5,-90.63 -0.75,-90.57 C22.77,-90.51 27.75,-70.12 27.72,-69.02 C27.55,-63.63 27.97,-25.67 27.97,-25.67 " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.353,0 0.2,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="333" - android:startOffset="67" - android:valueFrom="M-27.97 -59.3 C-27.97,-59.3 -28,-64.5 -27.97,-66.23 C-27.92,-68.37 -23.5,-90.63 -0.75,-90.57 C22.77,-90.51 27.75,-70.12 27.72,-69.02 C27.55,-63.63 27.97,-25.67 27.97,-25.67 " - android:valueTo="M79.79 -48.55 C79.79,-48.55 79.75,-53.75 79.78,-55.48 C79.83,-57.62 79.08,-78.36 53.07,-78.83 C29.5,-79.25 25.2,-59.38 25.22,-58.27 C25.25,-56.25 24.97,-31.17 24.97,-31.17 " - android:valueType="pathType"> - <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.542,0 0.026,1 1.0,1.0"/> - </aapt:attr> - </objectAnimator> - </set> - </aapt:attr> - </target> - <target android:name="_R_G_L_0_G_D_1_P_0"> - <aapt:attr name="android:animation"> - <set android:ordering="together"> - <objectAnimator android:propertyName="pathData" android:duration="67" - android:startOffset="0" - android:valueFrom="M-28.21 -31.92 C-28.21,-31.92 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.97,-31.67 27.97,-31.67 " - android:valueTo="M-27.97 -59.3 C-27.97,-59.3 -28,-64.5 -27.97,-66.23 C-27.92,-68.37 -23.5,-90.63 -0.75,-90.57 C22.77,-90.51 27.75,-70.12 27.72,-69.02 C27.55,-63.63 27.97,-25.67 27.97,-25.67 " - android:valueType="pathType"> + <objectAnimator + android:duration="67" + android:propertyName="pathData" + android:startOffset="0" + android:valueFrom="M14.33 14.33 C14.33,14.33 14.33,9.67 14.33,9.67 C14.33,7.09 12.24,5 9.67,5 C7.09,5 5,7.09 5,9.67 C5,9.67 5,14.33 5,14.33 " + android:valueTo="M14.33 14.33 C14.33,14.33 14.29,6.17 14.29,6.17 C14.29,3.59 12.2,1.5 9.63,1.5 C7.05,1.5 4.96,3.59 4.96,6.17 C4.96,6.17 4.96,7.33 4.96,7.33 " + android:valueType="pathType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.353,0 0.2,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.56,0 0.439,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="pathData" android:duration="333" - android:startOffset="67" - android:valueFrom="M-27.97 -59.3 C-27.97,-59.3 -28,-64.5 -27.97,-66.23 C-27.92,-68.37 -23.5,-90.63 -0.75,-90.57 C22.77,-90.51 27.75,-70.12 27.72,-69.02 C27.55,-63.63 27.97,-25.67 27.97,-25.67 " - android:valueTo="M79.79 -48.55 C79.79,-48.55 79.75,-53.75 79.78,-55.48 C79.83,-57.62 79.08,-78.36 53.07,-78.83 C29.5,-79.25 25.2,-59.38 25.22,-58.27 C25.25,-56.25 24.97,-31.17 24.97,-31.17 " - android:valueType="pathType"> + <objectAnimator + android:duration="333" + android:propertyName="pathData" + android:startOffset="67" + android:valueFrom="M14.33 14.33 C14.33,14.33 14.29,6.17 14.29,6.17 C14.29,3.59 12.2,1.5 9.63,1.5 C7.05,1.5 4.96,3.59 4.96,6.17 C4.96,6.17 4.96,7.33 4.96,7.33 " + android:valueTo="M14.33 14.33 C14.33,14.33 14.32,9.42 14.32,9.42 C14.32,7.4 15.67,5.01 18.65,5 C21.76,4.99 23.07,7.37 23.05,9.47 C23.05,9.47 23.06,9.77 23.06,9.77 " + android:valueType="pathType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.542,0 0.026,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.702,0 0.308,1 1.0,1.0" /> </aapt:attr> </objectAnimator> </set> @@ -211,26 +246,37 @@ <target android:name="_R_G_L_0_G_N_4_T_1"> <aapt:attr name="android:animation"> <set android:ordering="together"> - <objectAnimator android:propertyName="translateY" android:duration="133" - android:startOffset="0" android:valueFrom="3" - android:valueTo="1.625" android:valueType="floatType"> + <objectAnimator + android:duration="133" + android:propertyName="translateY" + android:startOffset="0" + android:valueFrom="24.993" + android:valueTo="22.493" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator - android:pathData="M 0.0,0.0 c0.075,0.167 0.622,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.378,0 0.622,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="translateY" android:duration="133" - android:startOffset="133" android:valueFrom="1.625" - android:valueTo="3.699" android:valueType="floatType"> + <objectAnimator + android:duration="133" + android:propertyName="translateY" + android:startOffset="133" + android:valueFrom="22.493" + android:valueTo="25.993" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.352,0 0.717,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.41,0 0.616,1 1.0,1.0" /> </aapt:attr> </objectAnimator> - <objectAnimator android:propertyName="translateY" android:duration="100" - android:startOffset="267" android:valueFrom="3.699" - android:valueTo="3" android:valueType="floatType"> + <objectAnimator + android:duration="100" + android:propertyName="translateY" + android:startOffset="267" + android:valueFrom="25.993" + android:valueTo="24.993" + android:valueType="floatType"> <aapt:attr name="android:interpolator"> - <pathInterpolator android:pathData="M 0.0,0.0 c0.356,0 0.527,1 1.0,1.0"/> + <pathInterpolator android:pathData="M 0.0,0.0 c0.427,0 0.508,1 1.0,1.0" /> </aapt:attr> </objectAnimator> </set> @@ -239,9 +285,13 @@ <target android:name="time_group"> <aapt:attr name="android:animation"> <set android:ordering="together"> - <objectAnimator android:propertyName="translateX" android:duration="717" - android:startOffset="0" android:valueFrom="0" android:valueTo="1" - android:valueType="floatType"/> + <objectAnimator + android:duration="717" + android:propertyName="translateX" + android:startOffset="0" + android:valueFrom="0" + android:valueTo="1" + android:valueType="floatType" /> </set> </aapt:attr> </target> diff --git a/data/res/anim/resolver_close_anim.xml b/data/res/anim/resolver_close_anim.xml new file mode 100644 index 0000000..18a25e9 --- /dev/null +++ b/data/res/anim/resolver_close_anim.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2009, 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. +*/ +--> + +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:interpolator="@anim/accelerate_interpolator" + android:zAdjustment="top"> + + <translate xmlns:android="http://schemas.android.com/apk/res/android" + android:fromYDelta="0" + android:toYDelta="100%" + android:duration="@android:integer/config_shortAnimTime" /> +</set> diff --git a/data/res/anim/resolver_launch_anim.xml b/data/res/anim/resolver_launch_anim.xml new file mode 100644 index 0000000..ebb3701 --- /dev/null +++ b/data/res/anim/resolver_launch_anim.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2019 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 + --> + +<!-- Animation for when a dock window at the bottom of the screen is entering. --> +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:interpolator="@anim/accelerate_decelerate_interpolator" + android:zAdjustment="top"> + + <translate android:fromYDelta="100%" + android:toYDelta="0" + android:startOffset="@android:integer/config_shortAnimTime" + android:duration="@android:integer/config_mediumAnimTime"/> +</set>
\ No newline at end of file |