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

Commit ff922de7 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Fix icon scaling" into main

parents bd6874ff 9d5635b2

packages/SystemUI/res/drawable/vd_bluetooth.xml

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 
        android:name="root_group"

        android:pivotX="32"

        android:pivotY="32"

        android:scaleX="0.66"

        android:scaleY="0.66"

        android:scaleX="0.8169"

        android:scaleY="0.8169"

        android:translateX="-20"

        android:translateY="-20">

        <group android:name="slash_group">

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

0 → 100644
+61 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

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

  -->



<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"

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

    android:drawable="@drawable/vd_screenrecord">

    <target android:name="center">

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

            <set>

                <objectAnimator

                    android:duration="500"

                    android:interpolator="@anim/overshoot"

                    android:propertyName="pathData"

                    android:valueType="pathType"

                    android:startOffset="0"

                    android:valueFrom="@string/path_screenrecord_center_on"

                    android:valueTo="@string/path_screenrecord_center_off" />

            </set>

        </aapt:attr>

    </target>

    <target android:name="center_group">

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

            <set>

                <objectAnimator

                    android:duration="500"

                    android:interpolator="@anim/overshoot"

                    android:propertyName="rotation"

                    android:startOffset="0"

                    android:valueFrom="180"

                    android:valueTo="0" />

            </set>

        </aapt:attr>

    </target>

    <target android:name="outer_group">

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

            <set>

                <objectAnimator

                    android:duration="500"

                    android:interpolator="@anim/overshoot"

                    android:propertyName="rotation"

                    android:startOffset="0"

                    android:valueFrom="360"

                    android:valueTo="0" />

            </set>

        </aapt:attr>

    </target>

</animated-vector>

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

0 → 100644
+61 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

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

  -->



<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"

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

    android:drawable="@drawable/vd_screenrecord">

    <target android:name="center">

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

            <set>

                <objectAnimator

                    android:duration="500"

                    android:interpolator="@anim/overshoot"

                    android:propertyName="pathData"

                    android:valueType="pathType"

                    android:startOffset="0"

                    android:valueFrom="@string/path_screenrecord_center_off"

                    android:valueTo="@string/path_screenrecord_center_on" />

            </set>

        </aapt:attr>

    </target>

    <target android:name="center_group">

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

            <set>

                <objectAnimator

                    android:duration="500"

                    android:interpolator="@anim/overshoot"

                    android:propertyName="rotation"

                    android:startOffset="0"

                    android:valueFrom="0"

                    android:valueTo="180" />

            </set>

        </aapt:attr>

    </target>

    <target android:name="outer_group">

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

            <set>

                <objectAnimator

                    android:duration="500"

                    android:interpolator="@anim/overshoot"

                    android:propertyName="rotation"

                    android:startOffset="0"

                    android:valueFrom="0"

                    android:valueTo="360" />

            </set>

        </aapt:attr>

    </target>

</animated-vector>
 
 No newline at end of file

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

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 
        android:name="root_group"

        android:pivotX="32"

        android:pivotY="32"

        android:scaleX="0.66"

        android:scaleY="0.66"

        android:scaleX="0.75"

        android:scaleY="0.75"

        android:translateX="-20"

        android:translateY="-20">

        <group android:name="plane">

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

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 
        android:name="root_group"

        android:pivotX="32"

        android:pivotY="32"

        android:scaleX="0.66"

        android:scaleY="0.66"

        android:scaleX="0.726"

        android:scaleY="0.726"

        android:translateX="-20"

        android:translateY="-20">

        <group