Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1590ce33 authored by Cyril Lee's avatar Cyril Lee Committed by android-build-merger
Browse files

Merge "Change fingerprint enrolling animation to 4 colors" into pi-dev am: 66640d64 

am: 7691959d

Change-Id: I517a30099c8f28ddbc6ab04bf6a94a339505c9f3
parents 121d5307 7691959d

res/anim/enrollment_fingerprint_background_1_path_animation.xml

0 → 100644
+51 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2018 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="sequentially" >

    <set

        android:ordering="together" >

        <objectAnimator

            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#000000"

            android:valueTo="#4285F4"

            android:valueType="intType"

            android:interpolator="@android:interpolator/linear_out_slow_in" />

        <objectAnimator

            android:duration="300"

            android:propertyName="fillAlpha"

            android:valueFrom="0.07f"

            android:valueTo="0.65f"

            android:valueType="floatType" />

    </set>

    <set

        android:ordering="together" >

        <objectAnimator

            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#4285F4"

            android:valueTo="#000000"

            android:valueType="intType"

            android:interpolator="@android:interpolator/fast_out_slow_in" />

        <objectAnimator

            android:duration="300"

            android:propertyName="fillAlpha"

            android:valueFrom="0.65f"

            android:valueTo="0.07f"

            android:valueType="floatType" />

    </set>

</set>

res/anim/enrollment_fingerprint_background_2_path_animation.xml

0 → 100644
+51 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2018 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="sequentially" >

    <set

        android:ordering="together" >

        <objectAnimator

            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#000000"

            android:valueTo="#EA4335"

            android:valueType="intType"

            android:interpolator="@android:interpolator/linear_out_slow_in" />

        <objectAnimator

            android:duration="300"

            android:propertyName="fillAlpha"

            android:valueFrom="0.07f"

            android:valueTo="0.65f"

            android:valueType="floatType" />

    </set>

    <set

        android:ordering="together" >

        <objectAnimator

            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#EA4335"

            android:valueTo="#000000"

            android:valueType="intType"

            android:interpolator="@android:interpolator/fast_out_slow_in" />

        <objectAnimator

            android:duration="300"

            android:propertyName="fillAlpha"

            android:valueFrom="0.65f"

            android:valueTo="0.07f"

            android:valueType="floatType" />

    </set>

</set>

res/anim/enrollment_fingerprint_background_5_path_animation.xml

0 → 100644
+51 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2018 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="sequentially" >

    <set

        android:ordering="together" >

        <objectAnimator

            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#000000"

            android:valueTo="#4285F4"

            android:valueType="intType"

            android:interpolator="@android:interpolator/linear_out_slow_in" />

        <objectAnimator

            android:duration="300"

            android:propertyName="fillAlpha"

            android:valueFrom="0.07f"

            android:valueTo="0.65f"

            android:valueType="floatType" />

    </set>

    <set

        android:ordering="together" >

        <objectAnimator

            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#4285F4"

            android:valueTo="#000000"

            android:valueType="intType"

            android:interpolator="@android:interpolator/fast_out_slow_in" />

        <objectAnimator

            android:duration="300"

            android:propertyName="fillAlpha"

            android:valueFrom="0.65f"

            android:valueTo="0.07f"

            android:valueType="floatType" />

    </set>

</set>

res/anim/enrollment_fingerprint_background_6_path_animation.xml

0 → 100644
+51 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2018 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="sequentially" >

    <set

        android:ordering="together" >

        <objectAnimator

            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#000000"

            android:valueTo="#FBBC04"

            android:valueType="intType"

            android:interpolator="@android:interpolator/linear_out_slow_in" />

        <objectAnimator

            android:duration="300"

            android:propertyName="fillAlpha"

            android:valueFrom="0.07f"

            android:valueTo="0.65f"

            android:valueType="floatType" />

    </set>

    <set

        android:ordering="together" >

        <objectAnimator

            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#FBBC04"

            android:valueTo="#000000"

            android:valueType="intType"

            android:interpolator="@android:interpolator/fast_out_slow_in" />

        <objectAnimator

            android:duration="300"

            android:propertyName="fillAlpha"

            android:valueFrom="0.65f"

            android:valueTo="0.07f"

            android:valueType="floatType" />

    </set>

</set>

res/anim/enrollment_fingerprint_background_7_path_animation.xml

0 → 100644
+51 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2018 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="sequentially" >

    <set

        android:ordering="together" >

        <objectAnimator

            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#000000"

            android:valueTo="#34A853"

            android:valueType="intType"

            android:interpolator="@android:interpolator/linear_out_slow_in" />

        <objectAnimator

            android:duration="300"

            android:propertyName="fillAlpha"

            android:valueFrom="0.07f"

            android:valueTo="0.65f"

            android:valueType="floatType" />

    </set>

    <set

        android:ordering="together" >

        <objectAnimator

            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#34A853"

            android:valueTo="#000000"

            android:valueType="intType"

            android:interpolator="@android:interpolator/fast_out_slow_in" />

        <objectAnimator

            android:duration="300"

            android:propertyName="fillAlpha"

            android:valueFrom="0.65f"

            android:valueTo="0.07f"

            android:valueType="floatType" />

    </set>

</set>