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

Commit c672ad8d authored by Ahmed Mehfooz's avatar Ahmed Mehfooz Committed by Android (Google) Code Review
Browse files

Merge "Fix icon sizes and slash paths" into main

parents eae915a2 73669b40

packages/SystemUI/res/flag(com.android.systemui.icon_refresh_2025)/animator/slash_mask_in.xml

+15 −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.

-->

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

    <objectAnimator

        android:duration="300"

packages/SystemUI/res/flag(com.android.systemui.icon_refresh_2025)/animator/slash_mask_out.xml

+15 −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.

-->

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

    <objectAnimator

        android:duration="200"

packages/SystemUI/res/flag(com.android.systemui.icon_refresh_2025)/animator/slash_path_in.xml

+16 −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.

-->

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

    android:ordering="together">

    <objectAnimator

packages/SystemUI/res/flag(com.android.systemui.icon_refresh_2025)/animator/slash_path_out.xml

+22 −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.

-->

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

    android:ordering="together">

    <objectAnimator
@@ -12,6 +28,12 @@ 
        android:startOffset="190"

        android:valueFrom="2.6"

        android:valueTo="0" />

    <objectAnimator

        android:duration="10"

        android:propertyName="strokeAlpha"

        android:startOffset="190"

        android:valueFrom="1"

        android:valueTo="0" />

    <objectAnimator

        android:duration="200"

        android:interpolator="@anim/ease_out"

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

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

        android:pivotX="32"

        android:pivotY="32"

        android:scaleX="0.85"

        android:scaleY="0.85"

        android:translateX="-20"

        android:scaleX="0.87"

        android:scaleY="0.87"

        android:translateX="-20.2"

        android:translateY="-20">

        <path

            android:name="icon"