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

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

Merge branch '1123-s-fingerprint' into 'v1-s' 

Fix fingerpint color so that it matches our palette

See merge request !156
parents 6cde1165 39069adc

res/anim/enrollment_fingerprint_background_1_path_animation.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#000000"

            android:valueTo="#4285F4"

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

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

        <objectAnimator

            android:duration="300"
@@ -35,7 +35,7 @@ 
        <objectAnimator

            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#4285F4"

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

            android:valueTo="#000000"

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

        <objectAnimator

res/anim/enrollment_fingerprint_background_2_path_animation.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#000000"

            android:valueTo="#4285F4"

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

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

        <objectAnimator

            android:duration="300"
@@ -35,7 +35,7 @@ 
        <objectAnimator

            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#4285F4"

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

            android:valueTo="#000000"

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

        <objectAnimator

res/anim/enrollment_fingerprint_background_5_path_animation.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#000000"

            android:valueTo="#4285F4"

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

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

        <objectAnimator

            android:duration="300"
@@ -35,7 +35,7 @@ 
        <objectAnimator

            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#4285F4"

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

            android:valueTo="#000000"

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

        <objectAnimator

res/anim/enrollment_fingerprint_background_6_path_animation.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#000000"

            android:valueTo="#4285F4"

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

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

        <objectAnimator

            android:duration="300"
@@ -35,7 +35,7 @@ 
        <objectAnimator

            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#4285F4"

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

            android:valueTo="#000000"

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

        <objectAnimator

res/anim/enrollment_fingerprint_background_7_path_animation.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#000000"

            android:valueTo="#4285F4"

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

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

        <objectAnimator

            android:duration="300"
@@ -35,7 +35,7 @@ 
        <objectAnimator

            android:duration="300"

            android:propertyName="fillColor"

            android:valueFrom="#4285F4"

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

            android:valueTo="#000000"

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

        <objectAnimator