Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master

2020-09-01 20:04:34 +00:00
parent 318f6bcc53 748efff856
commit d57e13f558
2628 changed files with 514897 additions and 439664 deletions
--- a/res/anim/enrollment_fingerprint_background_1_path_animation.xml
+++ b/res/anim/enrollment_fingerprint_background_1_path_animation.xml
@@ -23,14 +23,12 @@
            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" />
+            android:valueFrom="0.07"
+            android:valueTo="0.65" />
    </set>
    <set
        android:ordering="together" >
@@ -39,13 +37,11 @@
            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" />
+            android:valueFrom="0.65"
+            android:valueTo="0.07" />
    </set>
 </set>
--- a/res/anim/enrollment_fingerprint_background_2_path_animation.xml
+++ b/res/anim/enrollment_fingerprint_background_2_path_animation.xml
@@ -23,14 +23,12 @@
            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" />
+            android:valueFrom="0.07"
+            android:valueTo="0.65" />
    </set>
    <set
        android:ordering="together" >
@@ -39,13 +37,11 @@
            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" />
+            android:valueFrom="0.65"
+            android:valueTo="0.07" />
    </set>
 </set>
--- a/res/anim/enrollment_fingerprint_background_5_path_animation.xml
+++ b/res/anim/enrollment_fingerprint_background_5_path_animation.xml
@@ -23,14 +23,12 @@
            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" />
+            android:valueFrom="0.07"
+            android:valueTo="0.65" />
    </set>
    <set
        android:ordering="together" >
@@ -39,13 +37,11 @@
            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" />
+            android:valueFrom="0.65"
+            android:valueTo="0.07" />
    </set>
 </set>
--- a/res/anim/enrollment_fingerprint_background_6_path_animation.xml
+++ b/res/anim/enrollment_fingerprint_background_6_path_animation.xml
@@ -23,14 +23,12 @@
            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" />
+            android:valueFrom="0.07"
+            android:valueTo="0.65" />
    </set>
    <set
        android:ordering="together" >
@@ -39,13 +37,11 @@
            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" />
+            android:valueFrom="0.65"
+            android:valueTo="0.07" />
    </set>
 </set>
--- a/res/anim/enrollment_fingerprint_background_7_path_animation.xml
+++ b/res/anim/enrollment_fingerprint_background_7_path_animation.xml
@@ -23,14 +23,12 @@
            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" />
+            android:valueFrom="0.07"
+            android:valueTo="0.65" />
    </set>
    <set
        android:ordering="together" >
@@ -39,13 +37,11 @@
            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" />
+            android:valueFrom="0.65"
+            android:valueTo="0.07" />
    </set>
 </set>
--- a/res/drawable-hdpi/dotted_line_480px.png
+++ b/res/drawable-hdpi/dotted_line_480px.png
--- a/res/drawable-hdpi/ic_accessibility_generic.png
+++ b/res/drawable-hdpi/ic_accessibility_generic.png
--- a/res/drawable-hdpi/ic_menu_refresh_holo_dark.png
+++ b/res/drawable-hdpi/ic_menu_refresh_holo_dark.png
--- a/res/drawable-hdpi/ic_power_system.png
+++ b/res/drawable-hdpi/ic_power_system.png
--- a/res/drawable-hdpi/ic_settings_cell_standby.png
+++ b/res/drawable-hdpi/ic_settings_cell_standby.png
--- a/res/drawable-hdpi/ic_settings_development_alpha.png
+++ b/res/drawable-hdpi/ic_settings_development_alpha.png
--- a/res/drawable-hdpi/ic_settings_nfc_payment_am_alpha.png
+++ b/res/drawable-hdpi/ic_settings_nfc_payment_am_alpha.png
--- a/res/drawable-hdpi/ic_settings_phone_idle.png
+++ b/res/drawable-hdpi/ic_settings_phone_idle.png
--- a/res/drawable-hdpi/ic_settings_voice_calls.png
+++ b/res/drawable-hdpi/ic_settings_voice_calls.png
--- a/res/drawable-hdpi/ic_sync_grey_holo.png
+++ b/res/drawable-hdpi/ic_sync_grey_holo.png
--- a/res/drawable-hdpi/ic_sync_red_holo.png
+++ b/res/drawable-hdpi/ic_sync_red_holo.png
--- a/res/drawable-hdpi/ic_warning_googred_48dp.png
+++ b/res/drawable-hdpi/ic_warning_googred_48dp.png
--- a/res/drawable-hdpi/ic_wifi_lock_signal_1_dark.png
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_1_dark.png
--- a/res/drawable-hdpi/ic_wifi_lock_signal_2_dark.png
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_2_dark.png
--- a/res/drawable-hdpi/ic_wifi_lock_signal_3_dark.png
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_3_dark.png
--- a/res/drawable-hdpi/ic_wifi_lock_signal_4_dark.png
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_4_dark.png
--- a/res/drawable-hdpi/ic_wifi_signal_1_dark.png
+++ b/res/drawable-hdpi/ic_wifi_signal_1_dark.png
--- a/res/drawable-hdpi/ic_wifi_signal_2_dark.png
+++ b/res/drawable-hdpi/ic_wifi_signal_2_dark.png
--- a/res/drawable-hdpi/ic_wifi_signal_3_dark.png
+++ b/res/drawable-hdpi/ic_wifi_signal_3_dark.png
--- a/res/drawable-hdpi/ic_wifi_signal_4_dark.png
+++ b/res/drawable-hdpi/ic_wifi_signal_4_dark.png
--- a/res/drawable-hdpi/nav_divider.png
+++ b/res/drawable-hdpi/nav_divider.png
--- a/res/drawable-mdpi/dotted_line_480px.png
+++ b/res/drawable-mdpi/dotted_line_480px.png
--- a/res/drawable-mdpi/ic_accessibility_generic.png
+++ b/res/drawable-mdpi/ic_accessibility_generic.png
--- a/res/drawable-mdpi/ic_menu_refresh_holo_dark.png
+++ b/res/drawable-mdpi/ic_menu_refresh_holo_dark.png
--- a/res/drawable-mdpi/ic_power_system.png
+++ b/res/drawable-mdpi/ic_power_system.png
--- a/res/drawable-mdpi/ic_settings_cell_standby.png
+++ b/res/drawable-mdpi/ic_settings_cell_standby.png
--- a/res/drawable-mdpi/ic_settings_development_alpha.png
+++ b/res/drawable-mdpi/ic_settings_development_alpha.png
--- a/res/drawable-mdpi/ic_settings_nfc_payment_am_alpha.png
+++ b/res/drawable-mdpi/ic_settings_nfc_payment_am_alpha.png
--- a/res/drawable-mdpi/ic_settings_phone_idle.png
+++ b/res/drawable-mdpi/ic_settings_phone_idle.png
--- a/res/drawable-mdpi/ic_settings_voice_calls.png
+++ b/res/drawable-mdpi/ic_settings_voice_calls.png
--- a/res/drawable-mdpi/ic_sync_grey_holo.png
+++ b/res/drawable-mdpi/ic_sync_grey_holo.png
--- a/res/drawable-mdpi/ic_sync_red_holo.png
+++ b/res/drawable-mdpi/ic_sync_red_holo.png
--- a/res/drawable-mdpi/ic_wifi_lock_signal_1_dark.png
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_1_dark.png
--- a/res/drawable-mdpi/ic_wifi_lock_signal_2_dark.png
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_2_dark.png
--- a/res/drawable-mdpi/ic_wifi_lock_signal_3_dark.png
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_3_dark.png
--- a/res/drawable-mdpi/ic_wifi_lock_signal_4_dark.png
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_4_dark.png
--- a/res/drawable-mdpi/ic_wifi_signal_1_dark.png
+++ b/res/drawable-mdpi/ic_wifi_signal_1_dark.png
--- a/res/drawable-mdpi/ic_wifi_signal_2_dark.png
+++ b/res/drawable-mdpi/ic_wifi_signal_2_dark.png
--- a/res/drawable-mdpi/ic_wifi_signal_3_dark.png
+++ b/res/drawable-mdpi/ic_wifi_signal_3_dark.png
--- a/res/drawable-mdpi/ic_wifi_signal_4_dark.png
+++ b/res/drawable-mdpi/ic_wifi_signal_4_dark.png
--- a/res/drawable-mdpi/nav_divider.png
+++ b/res/drawable-mdpi/nav_divider.png
--- a/res/drawable-mdpi/nfc_how_it_works.png
+++ b/res/drawable-mdpi/nfc_how_it_works.png
--- a/res/drawable-mdpi/tapandpay_emptystate.png
+++ b/res/drawable-mdpi/tapandpay_emptystate.png
--- a/res/drawable-nodpi/nfc_detection_point.png
+++ b/res/drawable-nodpi/nfc_detection_point.png
--- a/res/drawable-xhdpi/dotted_line_480px.png
+++ b/res/drawable-xhdpi/dotted_line_480px.png
--- a/res/drawable-xhdpi/ic_accessibility_generic.png
+++ b/res/drawable-xhdpi/ic_accessibility_generic.png
--- a/res/drawable-xhdpi/ic_menu_refresh_holo_dark.png
+++ b/res/drawable-xhdpi/ic_menu_refresh_holo_dark.png
--- a/res/drawable-xhdpi/ic_power_system.png
+++ b/res/drawable-xhdpi/ic_power_system.png
--- a/res/drawable-xhdpi/ic_settings_cell_standby.png
+++ b/res/drawable-xhdpi/ic_settings_cell_standby.png
--- a/res/drawable-xhdpi/ic_settings_development_alpha.png
+++ b/res/drawable-xhdpi/ic_settings_development_alpha.png
--- a/res/drawable-xhdpi/ic_settings_nfc_payment_am_alpha.png
+++ b/res/drawable-xhdpi/ic_settings_nfc_payment_am_alpha.png
--- a/res/drawable-xhdpi/ic_settings_phone_idle.png
+++ b/res/drawable-xhdpi/ic_settings_phone_idle.png
--- a/res/drawable-xhdpi/ic_settings_voice_calls.png
+++ b/res/drawable-xhdpi/ic_settings_voice_calls.png
--- a/res/drawable-xhdpi/ic_sync_grey_holo.png
+++ b/res/drawable-xhdpi/ic_sync_grey_holo.png
--- a/res/drawable-xhdpi/ic_sync_red_holo.png
+++ b/res/drawable-xhdpi/ic_sync_red_holo.png
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_1_dark.png
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_1_dark.png
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_2_dark.png
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_2_dark.png
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_3_dark.png
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_3_dark.png
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_4_dark.png
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_4_dark.png
--- a/res/drawable-xhdpi/ic_wifi_signal_1_dark.png
+++ b/res/drawable-xhdpi/ic_wifi_signal_1_dark.png
--- a/res/drawable-xhdpi/ic_wifi_signal_2_dark.png
+++ b/res/drawable-xhdpi/ic_wifi_signal_2_dark.png
--- a/res/drawable-xhdpi/ic_wifi_signal_3_dark.png
+++ b/res/drawable-xhdpi/ic_wifi_signal_3_dark.png
--- a/res/drawable-xhdpi/ic_wifi_signal_4_dark.png
+++ b/res/drawable-xhdpi/ic_wifi_signal_4_dark.png
--- a/res/drawable-xhdpi/nav_divider.png
+++ b/res/drawable-xhdpi/nav_divider.png
--- a/res/drawable-xhdpi/nfc_how_it_works.png
+++ b/res/drawable-xhdpi/nfc_how_it_works.png
--- a/res/drawable-xhdpi/tapandpay_emptystate.png
+++ b/res/drawable-xhdpi/tapandpay_emptystate.png
--- a/res/drawable-xxhdpi/ic_accessibility_generic.png
+++ b/res/drawable-xxhdpi/ic_accessibility_generic.png
--- a/res/drawable-xxhdpi/ic_power_system.png
+++ b/res/drawable-xxhdpi/ic_power_system.png
--- a/res/drawable-xxhdpi/ic_settings_cell_standby.png
+++ b/res/drawable-xxhdpi/ic_settings_cell_standby.png
--- a/res/drawable-xxhdpi/ic_settings_development_alpha.png
+++ b/res/drawable-xxhdpi/ic_settings_development_alpha.png
--- a/res/drawable-xxhdpi/ic_settings_nfc_payment_am_alpha.png
+++ b/res/drawable-xxhdpi/ic_settings_nfc_payment_am_alpha.png
--- a/res/drawable-xxhdpi/ic_settings_phone_idle.png
+++ b/res/drawable-xxhdpi/ic_settings_phone_idle.png
--- a/res/drawable-xxhdpi/ic_settings_voice_calls.png
+++ b/res/drawable-xxhdpi/ic_settings_voice_calls.png
--- a/res/drawable-xxhdpi/ic_sync_grey_holo.png
+++ b/res/drawable-xxhdpi/ic_sync_grey_holo.png
--- a/res/drawable-xxhdpi/ic_sync_red_holo.png
+++ b/res/drawable-xxhdpi/ic_sync_red_holo.png
--- a/res/drawable-xxhdpi/ic_wifi_lock_signal_1_dark.png
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_dark.png
--- a/res/drawable-xxhdpi/ic_wifi_lock_signal_2_dark.png
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_dark.png
--- a/res/drawable-xxhdpi/ic_wifi_lock_signal_3_dark.png
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_dark.png
--- a/res/drawable-xxhdpi/ic_wifi_lock_signal_4_dark.png
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_dark.png
--- a/res/drawable-xxhdpi/ic_wifi_signal_1_dark.png
+++ b/res/drawable-xxhdpi/ic_wifi_signal_1_dark.png
--- a/res/drawable-xxhdpi/ic_wifi_signal_2_dark.png
+++ b/res/drawable-xxhdpi/ic_wifi_signal_2_dark.png
--- a/res/drawable-xxhdpi/ic_wifi_signal_3_dark.png
+++ b/res/drawable-xxhdpi/ic_wifi_signal_3_dark.png
--- a/res/drawable-xxhdpi/ic_wifi_signal_4_dark.png
+++ b/res/drawable-xxhdpi/ic_wifi_signal_4_dark.png
--- a/res/drawable-xxhdpi/nfc_how_it_works.png
+++ b/res/drawable-xxhdpi/nfc_how_it_works.png
--- a/res/drawable-xxhdpi/tapandpay_emptystate.png
+++ b/res/drawable-xxhdpi/tapandpay_emptystate.png
--- a/res/drawable-xxxhdpi/ic_accessibility_generic.png
+++ b/res/drawable-xxxhdpi/ic_accessibility_generic.png
--- a/res/drawable-xxxhdpi/ic_power_system.png
+++ b/res/drawable-xxxhdpi/ic_power_system.png
--- a/res/drawable-xxxhdpi/ic_settings_cell_standby.png
+++ b/res/drawable-xxxhdpi/ic_settings_cell_standby.png
--- a/res/drawable-xxxhdpi/ic_settings_development_alpha.png
+++ b/res/drawable-xxxhdpi/ic_settings_development_alpha.png
--- a/res/drawable-xxxhdpi/ic_settings_nfc_payment_am_alpha.png
+++ b/res/drawable-xxxhdpi/ic_settings_nfc_payment_am_alpha.png
--- a/res/drawable-xxxhdpi/ic_settings_phone_idle.png
+++ b/res/drawable-xxxhdpi/ic_settings_phone_idle.png
--- a/res/drawable-xxxhdpi/ic_settings_voice_calls.png
+++ b/res/drawable-xxxhdpi/ic_settings_voice_calls.png
--- a/res/drawable-xxxhdpi/ic_sync_grey_holo.png
+++ b/res/drawable-xxxhdpi/ic_sync_grey_holo.png
--- a/res/drawable-xxxhdpi/ic_sync_red_holo.png
+++ b/res/drawable-xxxhdpi/ic_sync_red_holo.png
--- a/res/drawable-xxxhdpi/ic_wifi_lock_signal_1_dark.png
+++ b/res/drawable-xxxhdpi/ic_wifi_lock_signal_1_dark.png
--- a/Show More
+++ b/Show More