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

Commit 93a05ffb authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Replace data saver icon" into main

parents 203fef02 f0c8e7ba

packages/SystemUI/res/flag(com.android.systemui.icon_refresh_2025)/drawable/qs_data_saver_icon_off.xml

+31 −77
Original line number Diff line number Diff line
@@ -17,105 +17,59 @@ 
<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:aapt="http://schemas.android.com/aapt"

    android:drawable="@drawable/vd_data_saver">

    <target android:name="top">

    <target android:name="circle_group">

        <aapt:attr name="android:animation">

            <set android:ordering="together">

                <objectAnimator

                    android:duration="200"

                    android:interpolator="@anim/ease"

                    android:propertyName="scaleX"

                    android:startOffset="0"

                    android:valueFrom="1"

                    android:valueTo="0.85" />

                <objectAnimator

                    android:duration="400"

                    android:interpolator="@anim/overshoot"

                    android:propertyName="scaleX"

                    android:startOffset="200"

                    android:valueFrom="0.85"

                    android:valueTo="1" />

                <objectAnimator

                    android:duration="200"

                    android:interpolator="@anim/ease"

                    android:propertyName="scaleY"

                    android:startOffset="0"

                    android:valueFrom="1"

                    android:valueTo="0.85" />

            <set>

                <objectAnimator

                    android:duration="400"

                    android:duration="500"

                    android:interpolator="@anim/overshoot"

                    android:propertyName="scaleY"

                    android:startOffset="200"

                    android:valueFrom="0.85"

                    android:valueTo="1" />

                    android:propertyName="rotation"

                    android:valueFrom="0"

                    android:valueTo="-180" />

            </set>

        </aapt:attr>

    </target>

    <target android:name="bottom">

    <target android:name="plus_group_exit">

        <aapt:attr name="android:animation">

            <set android:ordering="together">

                <objectAnimator

                    android:duration="200"

                    android:duration="250"

                    android:interpolator="@anim/ease"

                    android:propertyName="scaleX"

                    android:startOffset="20"

                    android:startOffset="0"

                    android:valueFrom="1"

                    android:valueTo="0.85" />

                    android:valueTo=".25" />

                <objectAnimator

                    android:duration="400"

                    android:interpolator="@anim/overshoot"

                    android:propertyName="scaleX"

                    android:startOffset="220"

                    android:valueFrom="0.85"

                    android:valueTo="1" />

                <objectAnimator

                    android:duration="200"

                    android:duration="250"

                    android:interpolator="@anim/ease"

                    android:propertyName="scaleY"

                    android:startOffset="20"

                    android:startOffset="0"

                    android:valueFrom="1"

                    android:valueTo="0.85" />

                <objectAnimator

                    android:duration="400"

                    android:interpolator="@anim/overshoot"

                    android:propertyName="scaleY"

                    android:startOffset="220"

                    android:valueFrom="0.85"

                    android:valueTo="1" />

                    android:valueTo=".25" />

            </set>

        </aapt:attr>

    </target>

    <target android:name="left">

    <target android:name="plus_path_exit">

        <aapt:attr name="android:animation">

            <set android:ordering="together">

                <objectAnimator

                    android:duration="200"

                    android:interpolator="@anim/ease"

                    android:propertyName="scaleX"

                    android:startOffset="60"

                    android:valueFrom="1"

                    android:valueTo="0.85" />

                <objectAnimator

                    android:duration="400"

                    android:interpolator="@anim/overshoot"

                    android:propertyName="scaleX"

                    android:startOffset="260"

                    android:valueFrom="0.85"

                    android:valueTo="1" />

            <set>

                <objectAnimator

                    android:duration="200"

                    android:interpolator="@anim/ease"

                    android:propertyName="scaleY"

                    android:startOffset="60"

                    android:duration="25"

                    android:propertyName="fillAlpha"

                    android:startOffset="75"

                    android:valueFrom="1"

                    android:valueTo="0.85" />

                    android:valueTo="0" />

            </set>

        </aapt:attr>

    </target>

    <target android:name="plus_path_entry">

        <aapt:attr name="android:animation">

            <set>

                <objectAnimator

                    android:duration="400"

                    android:interpolator="@anim/overshoot"

                    android:propertyName="scaleY"

                    android:startOffset="260"

                    android:valueFrom="0.85"

                    android:valueTo="1" />

                    android:duration="0"

                    android:propertyName="fillAlpha"

                    android:startOffset="0"

                    android:valueFrom="0"

                    android:valueTo="0" />

            </set>

        </aapt:attr>

    </target>

packages/SystemUI/res/flag(com.android.systemui.icon_refresh_2025)/drawable/qs_data_saver_icon_on.xml

+31 −77
Original line number Diff line number Diff line
@@ -17,105 +17,59 @@ 
<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:aapt="http://schemas.android.com/aapt"

    android:drawable="@drawable/vd_data_saver">

    <target android:name="top">

    <target android:name="circle_group">

        <aapt:attr name="android:animation">

            <set android:ordering="together">

            <set>

                <objectAnimator

                    android:duration="200"

                    android:interpolator="@anim/ease"

                    android:propertyName="scaleX"

                    android:startOffset="0"

                    android:valueFrom="1"

                    android:valueTo="1.2" />

                <objectAnimator

                    android:duration="400"

                    android:duration="500"

                    android:interpolator="@anim/overshoot"

                    android:propertyName="scaleX"

                    android:startOffset="200"

                    android:valueFrom="1.2"

                    android:valueTo="1" />

                <objectAnimator

                    android:duration="200"

                    android:interpolator="@anim/ease"

                    android:propertyName="scaleY"

                    android:startOffset="0"

                    android:valueFrom="1"

                    android:valueTo="1.2" />

                <objectAnimator

                    android:duration="400"

                    android:interpolator="@anim/overshoot"

                    android:propertyName="scaleY"

                    android:startOffset="200"

                    android:valueFrom="1.2"

                    android:valueTo="1" />

                    android:propertyName="rotation"

                    android:valueFrom="-180"

                    android:valueTo="0" />

            </set>

        </aapt:attr>

    </target>

    <target android:name="bottom">

    <target android:name="plus_group_entry">

        <aapt:attr name="android:animation">

            <set android:ordering="together">

                <objectAnimator

                    android:duration="200"

                    android:interpolator="@anim/ease"

                    android:propertyName="scaleX"

                    android:startOffset="20"

                    android:valueFrom="1"

                    android:valueTo="1.2" />

                <objectAnimator

                    android:duration="400"

                    android:duration="500"

                    android:interpolator="@anim/overshoot"

                    android:propertyName="scaleX"

                    android:startOffset="220"

                    android:valueFrom="1.2"

                    android:startOffset="0"

                    android:valueFrom=".5"

                    android:valueTo="1" />

                <objectAnimator

                    android:duration="200"

                    android:interpolator="@anim/ease"

                    android:propertyName="scaleY"

                    android:startOffset="20"

                    android:valueFrom="1"

                    android:valueTo="1.2" />

                <objectAnimator

                    android:duration="400"

                    android:duration="500"

                    android:interpolator="@anim/overshoot"

                    android:propertyName="scaleY"

                    android:startOffset="220"

                    android:valueFrom="1.2"

                    android:startOffset="0"

                    android:valueFrom=".5"

                    android:valueTo="1" />

            </set>

        </aapt:attr>

    </target>

    <target android:name="left">

    <target android:name="plus_path_entry">

        <aapt:attr name="android:animation">

            <set android:ordering="together">

                <objectAnimator

                    android:duration="200"

                    android:interpolator="@anim/ease"

                    android:propertyName="scaleX"

                    android:startOffset="60"

                    android:valueFrom="1"

                    android:valueTo="1.2" />

            <set>

                <objectAnimator

                    android:duration="400"

                    android:interpolator="@anim/overshoot"

                    android:propertyName="scaleX"

                    android:startOffset="260"

                    android:valueFrom="1.2"

                    android:duration="25"

                    android:propertyName="fillAlpha"

                    android:startOffset="50"

                    android:valueFrom="0"

                    android:valueTo="1" />

            </set>

        </aapt:attr>

    </target>

    <target android:name="plus_path_exit">

        <aapt:attr name="android:animation">

            <set>

                <objectAnimator

                    android:duration="200"

                    android:interpolator="@anim/ease"

                    android:propertyName="scaleY"

                    android:startOffset="60"

                    android:valueFrom="1"

                    android:valueTo="1.2" />

                <objectAnimator

                    android:duration="400"

                    android:interpolator="@anim/overshoot"

                    android:propertyName="scaleY"

                    android:startOffset="260"

                    android:valueFrom="1.2"

                    android:valueTo="1" />

                    android:duration="0"

                    android:propertyName="fillAlpha"

                    android:startOffset="0"

                    android:valueFrom="0"

                    android:valueTo="0"/>

            </set>

        </aapt:attr>

    </target>

packages/SystemUI/res/flag(com.android.systemui.icon_refresh_2025)/drawable/vd_data_saver.xml

+59 −25
Original line number Diff line number Diff line
@@ -22,38 +22,72 @@ 
    android:viewportHeight="24">

    <group

        android:name="root_group"

        android:pivotX="32"

        android:pivotY="32"

        android:scaleX="0.85"

        android:scaleY="0.85"

        android:translateX="-20"

        android:translateY="-20">

        android:pivotX="12"

        android:pivotY="12"

        android:scaleX="1.5"

        android:scaleY="1.5"> <!-- one master scale here -->

        <group

            android:name="left"

            android:pivotX="32"

            android:pivotY="32">

            android:name="plus_group_exit"

            android:pivotX="24"

            android:pivotY="24"

            android:scaleX="1"

            android:scaleY="1"

            android:translateX="-12"

            android:translateY="-12">

            <path

                android:name="path"

                android:fillColor="#ffffff"

                android:pathData="M30.9564 43.3187C28.0437 43.0254 25.6001 41.8037 23.6257 39.6533C21.6708 37.4834 20.6934 34.9323 20.6934 32C20.6934 29.0482 21.6708 26.4971 23.6257 24.3467C25.6001 22.1768 28.0437 20.955 30.9564 20.6813V43.3187Z" />

                android:name="plus_path_exit"

                android:fillAlpha="1"

                android:fillColor="#FFFFFF"

                android:pathData="M23.325 24.675H21.525C21.135 24.675 20.845 24.395 20.845 23.995C20.845 23.595 21.175 23.325 21.525 23.325H23.325V21.525C23.325 21.125 23.645 20.845 24.005 20.845C24.365 20.845 24.685 21.155 24.685 21.525V23.325H26.485C26.845 23.325 27.155 23.635 27.155 23.995C27.155 24.355 26.885 24.675 26.485 24.675H24.685V26.475C24.685 26.825 24.415 27.155 24.005 27.155C23.595 27.155 23.325 26.875 23.325 26.475V24.675Z" />

        </group>

        <group

            android:name="top"

            android:pivotX="32"

            android:pivotY="32">

            android:name="plus_group_entry"

            android:pivotX="24"

            android:pivotY="24"

            android:scaleX="1"

            android:scaleY="1"

            android:translateX="-12"

            android:translateY="-12">

            <path

                android:name="path"

                android:fillColor="#ffffff"

                android:pathData="M33.1556 20.6813V30.8857H43.36C43.0668 28.1489 41.9721 25.8324 40.0759 23.9362C38.1992 22.0204 35.8925 20.9355 33.1556 20.6813Z" />

                android:name="plus_path_entry"

                android:fillAlpha="0"

                android:fillColor="#FFFFFF"

                android:pathData="M23.325 24.675H21.525C21.135 24.675 20.845 24.395 20.845 23.995C20.845 23.595 21.175 23.325 21.525 23.325H23.325V21.525C23.325 21.125 23.645 20.845 24.005 20.845C24.365 20.845 24.685 21.155 24.685 21.525V23.325H26.485C26.845 23.325 27.155 23.635 27.155 23.995C27.155 24.355 26.885 24.675 26.485 24.675H24.685V26.475C24.685 26.825 24.415 27.155 24.005 27.155C23.595 27.155 23.325 26.875 23.325 26.475V24.675Z" />

        </group>

        <group

            android:name="bottom"

            android:pivotX="32"

            android:pivotY="32">

            android:name="circle_group"

            android:pivotX="0"

            android:pivotY="0"

            android:rotation="-180"

            android:scaleX="1"

            android:scaleY="1"

            android:translateX="12"

            android:translateY="12">

            <group

                android:name="large_path_group"

                android:rotation="130">

                <path

                    android:name="large_circle_path"

                    android:pathData="M-6.3,0 A6.3,6.3 0 1,1 6.3,0 A6.3,6.3 0 1,1 -6.3,0 Z"

                    android:strokeWidth="1.8"

                    android:strokeColor="#FFFFFF"

                    android:strokeLineCap="round"

                    android:trimPathStart=".27"

                    android:trimPathEnd=".845" />

            </group>

            <group

                android:name="small_path_group"

                android:rotation="90">

                <path

                android:name="path"

                android:fillColor="#ffffff"

                android:pathData="M33.1556 33.085V43.3187C35.8925 43.0645 38.209 41.9796 40.1052 40.0638C42.021 38.1481 43.1059 35.8218 43.36 33.085H33.1556Z" />

                    android:name="small_circle_path"

                    android:pathData="M-6.3,0 A6.3,6.3 0 1,1 6.3,0 A6.3,6.3 0 1,1 -6.3,0 Z"

                    android:strokeWidth="1.8"

                    android:strokeColor="#FFFFFF"

                    android:strokeLineCap="round"

                    android:trimPathStart=".045"

                    android:trimPathEnd=".29" />

            </group>

        </group>

    </group>

</vector>