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

Commit 879720cb authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Display mobile data type icons in status bar." into pi-dev am:...

Merge "Merge "Display mobile data type icons in status bar." into pi-dev am: b87b0327" into pi-dev-plus-aosp
parents 3c0225cc ac8d52dd
Loading
Loading
Loading
Loading
+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="#FFFFFFFF"/>
        <keyframe
            android:fraction="0.32"
            android:value="#FFFFFFFF"/>
        <keyframe
            android:fraction="0.33"
            android:value="#4DFFFFFF"/>
        <keyframe
            android:fraction="1.0"
            android:value="#4DFFFFFF"/>
    </propertyValuesHolder>

</objectAnimator>
+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="#4DFFFFFF"/>
        <keyframe
            android:fraction="0.32"
            android:value="#4DFFFFFF"/>
        <keyframe
            android:fraction="0.33"
            android:value="#FFFFFFFF"/>
        <keyframe
            android:fraction="0.66"
            android:value="#FFFFFFFF"/>
        <keyframe
            android:fraction="0.67"
            android:value="#4DFFFFFF"/>
        <keyframe
            android:fraction="1.0"
            android:value="#4DFFFFFF"/>
    </propertyValuesHolder>

</objectAnimator>
+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="#4DFFFFFF"/>
        <keyframe
            android:fraction="0.66"
            android:value="#4DFFFFFF"/>
        <keyframe
            android:fraction="0.67"
            android:value="#FFFFFFFF"/>
        <keyframe
            android:fraction="1.0"
            android:value="#FFFFFFFF"/>
    </propertyValuesHolder>

</objectAnimator>
+29 −0
Original line number Diff line number Diff line
<!--
     Copyright (C) 2018 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.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24">

    <path
        android:fillColor="#FFFFFFFF"
        android:pathData="M4,7h4v10H6V9H4V7z M15.83,11.72L18.66,7h-2.33l-1.66,2.77L13,7h-2.33l2.83,4.72L10.33,17h2.33l2-3.34l2,3.34H19 L15.83,11.72z" />
    <path
        android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
    <path
        android:pathData="M0,0h24v24H0V0z" />
</vector>
+29 −0
Original line number Diff line number Diff line
<!--
     Copyright (C) 2018 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.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24">

    <path
        android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
    <path
        android:pathData="M0,0h24v24H0V0z" />
    <path
        android:fillColor="#FFFFFFFF"
        android:pathData="M3,7v2h5v2H4v2h4v2H3v2h5c1.1,0,2-0.9,2-2v-1.5c0-0.83-0.67-1.5-1.5-1.5c0.83,0,1.5-0.67,1.5-1.5V9c0-1.1-0.9-2-2-2H3z M21,11v4c0,1.1-0.9,2-2,2h-5c-1.1,0-2-0.9-2-2V9c0-1.1,0.9-2,2-2h5c1.1,0,2,0.9,2,2h-2h-5v6h5v-2h-2.5v-2H21z" />
</vector>
Loading