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

Commit eb0fb860 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch 'epic211-a16-qpr0' into 'a16' 

Port theming changes from A15 and other additional fixes

See merge request !253
parents e2198be7 08700a2a

res/anim/enrollment_fingerprint_background_1_path_animation.xml

+4 −14
Original line number Diff line number Diff line
@@ -21,27 +21,17 @@ 
        <objectAnimator

            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#000000"

            android:valueTo="#4285F4"

            android:valueFrom="@color/e_fingerprint_hint"

            android:valueTo="@*android:color/accent_device_default"

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

        <objectAnimator

            android:duration="300"

            android:propertyName="fillAlpha"

            android:valueFrom="0.07"

            android:valueTo="0.65" />

    </set>

    <set

        android:ordering="together" >

        <objectAnimator

            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#4285F4"

            android:valueTo="#000000"

            android:valueFrom="@*android:color/accent_device_default"

            android:valueTo="@color/e_fingerprint_hint"

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

        <objectAnimator

            android:duration="300"

            android:propertyName="fillAlpha"

            android:valueFrom="0.65"

            android:valueTo="0.07" />

    </set>

</set>

res/anim/enrollment_fingerprint_background_2_path_animation.xml

+4 −14
Original line number Diff line number Diff line
@@ -21,27 +21,17 @@ 
        <objectAnimator

            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#000000"

            android:valueTo="#4285F4"

            android:valueFrom="@color/e_fingerprint_hint"

            android:valueTo="@*android:color/accent_device_default"

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

        <objectAnimator

            android:duration="300"

            android:propertyName="fillAlpha"

            android:valueFrom="0.07"

            android:valueTo="0.65" />

    </set>

    <set

        android:ordering="together" >

        <objectAnimator

            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#4285F4"

            android:valueTo="#000000"

            android:valueFrom="@*android:color/accent_device_default"

            android:valueTo="@color/e_fingerprint_hint"

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

        <objectAnimator

            android:duration="300"

            android:propertyName="fillAlpha"

            android:valueFrom="0.65"

            android:valueTo="0.07" />

    </set>

</set>

res/anim/enrollment_fingerprint_background_5_path_animation.xml

+4 −14
Original line number Diff line number Diff line
@@ -21,27 +21,17 @@ 
        <objectAnimator

            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#000000"

            android:valueTo="#4285F4"

            android:valueFrom="@color/e_fingerprint_hint"

            android:valueTo="@*android:color/accent_device_default"

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

        <objectAnimator

            android:duration="300"

            android:propertyName="fillAlpha"

            android:valueFrom="0.07"

            android:valueTo="0.65" />

    </set>

    <set

        android:ordering="together" >

        <objectAnimator

            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#4285F4"

            android:valueTo="#000000"

            android:valueFrom="@*android:color/accent_device_default"

            android:valueTo="@color/e_fingerprint_hint"

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

        <objectAnimator

            android:duration="300"

            android:propertyName="fillAlpha"

            android:valueFrom="0.65"

            android:valueTo="0.07" />

    </set>

</set>

res/anim/enrollment_fingerprint_background_6_path_animation.xml

+4 −14
Original line number Diff line number Diff line
@@ -21,27 +21,17 @@ 
        <objectAnimator

            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#000000"

            android:valueTo="#4285F4"

            android:valueFrom="@color/e_fingerprint_hint"

            android:valueTo="@*android:color/accent_device_default"

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

        <objectAnimator

            android:duration="300"

            android:propertyName="fillAlpha"

            android:valueFrom="0.07"

            android:valueTo="0.65" />

    </set>

    <set

        android:ordering="together" >

        <objectAnimator

            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#4285F4"

            android:valueTo="#000000"

            android:valueFrom="@*android:color/accent_device_default"

            android:valueTo="@color/e_fingerprint_hint"

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

        <objectAnimator

            android:duration="300"

            android:propertyName="fillAlpha"

            android:valueFrom="0.65"

            android:valueTo="0.07" />

    </set>

</set>

res/anim/enrollment_fingerprint_background_7_path_animation.xml

+4 −14
Original line number Diff line number Diff line
@@ -21,27 +21,17 @@ 
        <objectAnimator

            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#000000"

            android:valueTo="#4285F4"

            android:valueFrom="@color/e_fingerprint_hint"

            android:valueTo="@*android:color/accent_device_default"

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

        <objectAnimator

            android:duration="300"

            android:propertyName="fillAlpha"

            android:valueFrom="0.07"

            android:valueTo="0.65" />

    </set>

    <set

        android:ordering="together" >

        <objectAnimator

            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#4285F4"

            android:valueTo="#000000"

            android:valueFrom="@*android:color/accent_device_default"

            android:valueTo="@color/e_fingerprint_hint"

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

        <objectAnimator

            android:duration="300"

            android:propertyName="fillAlpha"

            android:valueFrom="0.65"

            android:valueTo="0.07" />

    </set>

</set>