PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed type missmatch"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-08-28 00:30:39 +00:00
committed by Android (Google) Code Review
parent cfa94dfee1 d1fd424dc8
commit dd57ca7abe
5 changed files with 20 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/anim/enrollment_fingerprint_background_1_path_animation.xml
View File

@@ -23,14 +23,12 @@
android:propertyName="fillColor" android:propertyName="fillColor"
android:valueFrom="#000000" android:valueFrom="#000000"
android:valueTo="#4285F4" android:valueTo="#4285F4"
android:valueType="intType"
android:interpolator="@android:interpolator/linear_out_slow_in" /> android:interpolator="@android:interpolator/linear_out_slow_in" />
<objectAnimator <objectAnimator
android:duration="300" android:duration="300"
android:propertyName="fillAlpha" android:propertyName="fillAlpha"
android:valueFrom="0.07f" android:valueFrom="0.07"
android:valueTo="0.65f" android:valueTo="0.65" />
android:valueType="floatType" />
</set> </set>
<set <set
android:ordering="together" > android:ordering="together" >
@@ -39,13 +37,11 @@
android:propertyName="fillColor" android:propertyName="fillColor"
android:valueFrom="#4285F4" android:valueFrom="#4285F4"
android:valueTo="#000000" android:valueTo="#000000"
android:valueType="intType"
android:interpolator="@android:interpolator/fast_out_slow_in" /> android:interpolator="@android:interpolator/fast_out_slow_in" />
<objectAnimator <objectAnimator
android:duration="300" android:duration="300"
android:propertyName="fillAlpha" android:propertyName="fillAlpha"
android:valueFrom="0.65f" android:valueFrom="0.65"
android:valueTo="0.07f" android:valueTo="0.07" />
android:valueType="floatType" />
</set> </set>
</set> </set>

12
res/anim/enrollment_fingerprint_background_2_path_animation.xml
View File

@@ -23,14 +23,12 @@
android:propertyName="fillColor" android:propertyName="fillColor"
android:valueFrom="#000000" android:valueFrom="#000000"
android:valueTo="#4285F4" android:valueTo="#4285F4"
android:valueType="intType"
android:interpolator="@android:interpolator/linear_out_slow_in" /> android:interpolator="@android:interpolator/linear_out_slow_in" />
<objectAnimator <objectAnimator
android:duration="300" android:duration="300"
android:propertyName="fillAlpha" android:propertyName="fillAlpha"
android:valueFrom="0.07f" android:valueFrom="0.07"
android:valueTo="0.65f" android:valueTo="0.65" />
android:valueType="floatType" />
</set> </set>
<set <set
android:ordering="together" > android:ordering="together" >
@@ -39,13 +37,11 @@
android:propertyName="fillColor" android:propertyName="fillColor"
android:valueFrom="#4285F4" android:valueFrom="#4285F4"
android:valueTo="#000000" android:valueTo="#000000"
android:valueType="intType"
android:interpolator="@android:interpolator/fast_out_slow_in" /> android:interpolator="@android:interpolator/fast_out_slow_in" />
<objectAnimator <objectAnimator
android:duration="300" android:duration="300"
android:propertyName="fillAlpha" android:propertyName="fillAlpha"
android:valueFrom="0.65f" android:valueFrom="0.65"
android:valueTo="0.07f" android:valueTo="0.07" />
android:valueType="floatType" />
</set> </set>
</set> </set>

12
res/anim/enrollment_fingerprint_background_5_path_animation.xml
View File

@@ -23,14 +23,12 @@
android:propertyName="fillColor" android:propertyName="fillColor"
android:valueFrom="#000000" android:valueFrom="#000000"
android:valueTo="#4285F4" android:valueTo="#4285F4"
android:valueType="intType"
android:interpolator="@android:interpolator/linear_out_slow_in" /> android:interpolator="@android:interpolator/linear_out_slow_in" />
<objectAnimator <objectAnimator
android:duration="300" android:duration="300"
android:propertyName="fillAlpha" android:propertyName="fillAlpha"
android:valueFrom="0.07f" android:valueFrom="0.07"
android:valueTo="0.65f" android:valueTo="0.65" />
android:valueType="floatType" />
</set> </set>
<set <set
android:ordering="together" > android:ordering="together" >
@@ -39,13 +37,11 @@
android:propertyName="fillColor" android:propertyName="fillColor"
android:valueFrom="#4285F4" android:valueFrom="#4285F4"
android:valueTo="#000000" android:valueTo="#000000"
android:valueType="intType"
android:interpolator="@android:interpolator/fast_out_slow_in" /> android:interpolator="@android:interpolator/fast_out_slow_in" />
<objectAnimator <objectAnimator
android:duration="300" android:duration="300"
android:propertyName="fillAlpha" android:propertyName="fillAlpha"
android:valueFrom="0.65f" android:valueFrom="0.65"
android:valueTo="0.07f" android:valueTo="0.07" />
android:valueType="floatType" />
</set> </set>
</set> </set>

12
res/anim/enrollment_fingerprint_background_6_path_animation.xml
View File

@@ -23,14 +23,12 @@
android:propertyName="fillColor" android:propertyName="fillColor"
android:valueFrom="#000000" android:valueFrom="#000000"
android:valueTo="#4285F4" android:valueTo="#4285F4"
android:valueType="intType"
android:interpolator="@android:interpolator/linear_out_slow_in" /> android:interpolator="@android:interpolator/linear_out_slow_in" />
<objectAnimator <objectAnimator
android:duration="300" android:duration="300"
android:propertyName="fillAlpha" android:propertyName="fillAlpha"
android:valueFrom="0.07f" android:valueFrom="0.07"
android:valueTo="0.65f" android:valueTo="0.65" />
android:valueType="floatType" />
</set> </set>
<set <set
android:ordering="together" > android:ordering="together" >
@@ -39,13 +37,11 @@
android:propertyName="fillColor" android:propertyName="fillColor"
android:valueFrom="#4285F4" android:valueFrom="#4285F4"
android:valueTo="#000000" android:valueTo="#000000"
android:valueType="intType"
android:interpolator="@android:interpolator/fast_out_slow_in" /> android:interpolator="@android:interpolator/fast_out_slow_in" />
<objectAnimator <objectAnimator
android:duration="300" android:duration="300"
android:propertyName="fillAlpha" android:propertyName="fillAlpha"
android:valueFrom="0.65f" android:valueFrom="0.65"
android:valueTo="0.07f" android:valueTo="0.07" />
android:valueType="floatType" />
</set> </set>
</set> </set>

12
res/anim/enrollment_fingerprint_background_7_path_animation.xml
View File

@@ -23,14 +23,12 @@
android:propertyName="fillColor" android:propertyName="fillColor"
android:valueFrom="#000000" android:valueFrom="#000000"
android:valueTo="#4285F4" android:valueTo="#4285F4"
android:valueType="intType"
android:interpolator="@android:interpolator/linear_out_slow_in" /> android:interpolator="@android:interpolator/linear_out_slow_in" />
<objectAnimator <objectAnimator
android:duration="300" android:duration="300"
android:propertyName="fillAlpha" android:propertyName="fillAlpha"
android:valueFrom="0.07f" android:valueFrom="0.07"
android:valueTo="0.65f" android:valueTo="0.65" />
android:valueType="floatType" />
</set> </set>
<set <set
android:ordering="together" > android:ordering="together" >
@@ -39,13 +37,11 @@
android:propertyName="fillColor" android:propertyName="fillColor"
android:valueFrom="#4285F4" android:valueFrom="#4285F4"
android:valueTo="#000000" android:valueTo="#000000"
android:valueType="intType"
android:interpolator="@android:interpolator/fast_out_slow_in" /> android:interpolator="@android:interpolator/fast_out_slow_in" />
<objectAnimator <objectAnimator
android:duration="300" android:duration="300"
android:propertyName="fillAlpha" android:propertyName="fillAlpha"
android:valueFrom="0.65f" android:valueFrom="0.65"
android:valueTo="0.07f" android:valueTo="0.07" />
android:valueType="floatType" />
</set> </set>
</set> </set>