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

Commit 9d28852f authored by Andrew Flynn's avatar Andrew Flynn Committed by Android (Google) Code Review
Browse files

Merge "Remove separate light/dark animated vector drawables" into mnc-dev

parents 8c1e287b 2fdbe128

packages/SystemUI/res/anim/ic_signal_blink_1.xml

+4 −4
Original line number Diff line number Diff line
@@ -23,16 +23,16 @@ 
        android:valueType="colorType">

        <keyframe

            android:fraction="0.0"

            android:value="@color/light_mode_icon_color_dual_tone_fill"/>

            android:value="?attr/fillColor"/>

        <keyframe

            android:fraction="0.32"

            android:value="@color/light_mode_icon_color_dual_tone_fill"/>

            android:value="?attr/fillColor"/>

        <keyframe

            android:fraction="0.33"

            android:value="@color/light_mode_icon_color_dual_tone_background"/>

            android:value="?attr/backgroundColor"/>

        <keyframe

            android:fraction="1.0"

            android:value="@color/light_mode_icon_color_dual_tone_background"/>

            android:value="?attr/backgroundColor"/>

    </propertyValuesHolder>



</objectAnimator>

packages/SystemUI/res/anim/ic_signal_blink_2.xml

+6 −6
Original line number Diff line number Diff line
@@ -23,22 +23,22 @@ 
        android:valueType="colorType">

        <keyframe

            android:fraction="0.0"

            android:value="@color/light_mode_icon_color_dual_tone_background"/>

            android:value="?attr/backgroundColor"/>

        <keyframe

            android:fraction="0.32"

            android:value="@color/light_mode_icon_color_dual_tone_background"/>

            android:value="?attr/backgroundColor"/>

        <keyframe

            android:fraction="0.33"

            android:value="@color/light_mode_icon_color_dual_tone_fill"/>

            android:value="?attr/fillColor"/>

        <keyframe

            android:fraction="0.66"

            android:value="@color/light_mode_icon_color_dual_tone_fill"/>

            android:value="?attr/fillColor"/>

        <keyframe

            android:fraction="0.67"

            android:value="@color/light_mode_icon_color_dual_tone_background"/>

            android:value="?attr/backgroundColor"/>

        <keyframe

            android:fraction="1.0"

            android:value="@color/light_mode_icon_color_dual_tone_background"/>

            android:value="?attr/backgroundColor"/>

    </propertyValuesHolder>



</objectAnimator>

packages/SystemUI/res/anim/ic_signal_blink_3.xml

+4 −4
Original line number Diff line number Diff line
@@ -23,16 +23,16 @@ 
        android:valueType="colorType">

        <keyframe

            android:fraction="0.0"

            android:value="@color/light_mode_icon_color_dual_tone_background"/>

            android:value="?attr/backgroundColor"/>

        <keyframe

            android:fraction="0.66"

            android:value="@color/light_mode_icon_color_dual_tone_background"/>

            android:value="?attr/backgroundColor"/>

        <keyframe

            android:fraction="0.67"

            android:value="@color/light_mode_icon_color_dual_tone_fill"/>

            android:value="?attr/fillColor"/>

        <keyframe

            android:fraction="1.0"

            android:value="@color/light_mode_icon_color_dual_tone_fill"/>

            android:value="?attr/fillColor"/>

    </propertyValuesHolder>



</objectAnimator>

packages/SystemUI/res/anim/ic_signal_dark_blink_1.xml

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
<!--

    Copyright (C) 2015 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.

-->

<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"

    android:interpolator="@android:anim/linear_interpolator"

    android:duration="@integer/carrier_network_change_anim_time"

    android:repeatCount="-1">



    <propertyValuesHolder

        android:propertyName="fillColor"

        android:valueType="colorType">

        <keyframe

            android:fraction="0.0"

            android:value="@color/dark_mode_icon_color_dual_tone_fill"/>

        <keyframe

            android:fraction="0.32"

            android:value="@color/dark_mode_icon_color_dual_tone_fill"/>

        <keyframe

            android:fraction="0.33"

            android:value="@color/dark_mode_icon_color_dual_tone_background"/>

        <keyframe

            android:fraction="1.0"

            android:value="@color/dark_mode_icon_color_dual_tone_background"/>

    </propertyValuesHolder>



</objectAnimator>

packages/SystemUI/res/anim/ic_signal_dark_blink_2.xml

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
<!--

    Copyright (C) 2015 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.

-->

<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"

    android:interpolator="@android:anim/linear_interpolator"

    android:duration="@integer/carrier_network_change_anim_time"

    android:repeatCount="-1">



    <propertyValuesHolder

        android:propertyName="fillColor"

        android:valueType="colorType">

        <keyframe

            android:fraction="0.0"

            android:value="@color/dark_mode_icon_color_dual_tone_background"/>

        <keyframe

            android:fraction="0.32"

            android:value="@color/dark_mode_icon_color_dual_tone_background"/>

        <keyframe

            android:fraction="0.33"

            android:value="@color/dark_mode_icon_color_dual_tone_fill"/>

        <keyframe

            android:fraction="0.66"

            android:value="@color/dark_mode_icon_color_dual_tone_fill"/>

        <keyframe

            android:fraction="0.67"

            android:value="@color/dark_mode_icon_color_dual_tone_background"/>

        <keyframe

            android:fraction="1.0"

            android:value="@color/dark_mode_icon_color_dual_tone_background"/>

    </propertyValuesHolder>



</objectAnimator>