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

Commit 4d8aa00a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update themed icon colors" into udc-dev am: 659bc55d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/systemui/+/23176920



Change-Id: I443fde1b34c894adcf6928386eefb2bbefc45c66
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a4dbbc3a 659bc55d

iconloaderlib/res/drawable/ic_clone_app_badge_themed.xml

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

<!-- Copyright (C) 2023 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="@dimen/profile_badge_size"

    android:height="@dimen/profile_badge_size"

    android:viewportWidth="24"

    android:viewportHeight="24">



    <path

        android:fillColor="#11000000"

        android:pathData="M.5,12.25

        A11.5,11.5 0 1,1 23.5,12.25

        A11.5,11.5 0 1,1 .5,12.25" />



    <path

        android:fillColor="@color/themed_icon_background_color"

        android:pathData="M1,12

        A11,11 0 1,1 23,12

        A11,11 0 1,1 1,12" />



    <group android:scaleX=".6" android:scaleY=".6" android:pivotX="12" android:pivotY="12">

      <path

        android:pathData="M22,9.5C22,13.642 18.642,17 14.5,17C10.358,17 7,13.642 7,9.5C7,5.358 10.358,2 14.5,2C18.642,2 22,5.358 22,9.5Z"

        android:fillColor="@color/themed_badge_icon_color"/>

    <path

        android:pathData="M9.5,20.333C12.722,20.333 15.333,17.722 15.333,14.5C15.333,11.278 12.722,8.667 9.5,8.667C6.278,8.667 3.667,11.278 3.667,14.5C3.667,17.722 6.278,20.333 9.5,20.333ZM9.5,22C13.642,22 17,18.642 17,14.5C17,10.358 13.642,7 9.5,7C5.358,7 2,10.358 2,14.5C2,18.642 5.358,22 9.5,22Z"

        android:fillColor="@color/themed_badge_icon_color"

        android:fillType="evenOdd"/>

    </group>

</vector>

iconloaderlib/res/drawable/ic_instant_app_badge.xml

+0 −9
Original line number Diff line number Diff line
@@ -19,21 +19,12 @@ 
    android:viewportWidth="18"

    android:viewportHeight="18">



    <path

        android:fillColor="@android:color/black"

        android:strokeWidth="1"

        android:pathData="M 9 0 C 13.9705627485 0 18 4.02943725152 18 9 C 18 13.9705627485 13.9705627485 18 9 18 C 4.02943725152 18 0 13.9705627485 0 9 C 0 4.02943725152 4.02943725152 0 9 0 Z" />

    <path

        android:fillColor="@android:color/white"

        android:strokeWidth="1"

        android:pathData="M 9 0 C 13.9705627485 0 18 4.02943725152 18 9 C 18 13.9705627485 13.9705627485 18 9 18 C 4.02943725152 18 0 13.9705627485 0 9 C 0 4.02943725152 4.02943725152 0 9 0 Z" />

    <path

        android:fillColor="@android:color/white"

        android:strokeWidth="1"

        android:pathData="M 9 0 C 13.9705627485 0 18 4.02943725152 18 9 C 18 13.9705627485 13.9705627485 18 9 18 C 4.02943725152 18 0 13.9705627485 0 9 C 0 4.02943725152 4.02943725152 0 9 0 Z" />

    <path

        android:fillColor="@android:color/black"

        android:fillAlpha="0.87"

        android:strokeWidth="1"

        android:pathData="M 6 10.4123279 L 8.63934949 10.4123279 L 8.63934949 15.6 L 12.5577168 7.84517705 L 9.94547194 7.84517705 L 9.94547194 2 Z" />

</vector>

iconloaderlib/res/drawable/ic_instant_app_badge_themed.xml

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

<!-- Copyright (C) 2017 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="@dimen/profile_badge_size"

    android:height="@dimen/profile_badge_size"

    android:viewportWidth="18"

    android:viewportHeight="18">



    <path

        android:fillColor="@color/themed_badge_icon_background_color"

        android:strokeWidth="1"

        android:pathData="M 9 0 C 13.9705627485 0 18 4.02943725152 18 9 C 18 13.9705627485 13.9705627485 18 9 18 C 4.02943725152 18 0 13.9705627485 0 9 C 0 4.02943725152 4.02943725152 0 9 0 Z" />

    <path

        android:fillColor="@color/themed_badge_icon_color"

        android:strokeWidth="1"

        android:pathData="M 6 10.4123279 L 8.63934949 10.4123279 L 8.63934949 15.6 L 12.5577168 7.84517705 L 9.94547194 7.84517705 L 9.94547194 2 Z" />

</vector>

iconloaderlib/res/drawable/ic_work_app_badge_themed.xml

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

<!-- Copyright (C) 2023 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="@dimen/profile_badge_size"

    android:height="@dimen/profile_badge_size"

    android:viewportWidth="24"

    android:viewportHeight="24">



    <path

        android:fillColor="#11000000"

        android:pathData="M.5,12.25

        A11.5,11.5 0 1,1 23.5,12.25

        A11.5,11.5 0 1,1 .5,12.25" />



    <path

        android:fillColor="@color/themed_badge_icon_background_color"

        android:pathData="M1,12

        A11,11 0 1,1 23,12

        A11,11 0 1,1 1,12" />



    <group android:scaleX=".6" android:scaleY=".6" android:pivotX="12" android:pivotY="12">

        <path

            android:fillColor="@color/themed_badge_icon_color"

            android:pathData="M20,6h-4L16,4c0,-1.11 -0.89,-2 -2,-2h-4c-1.11,0 -2,0.89 -2,2v2L4,6c-1.11,0 -1.99,0.89 -1.99,2L2,19c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM14,6h-4L10,4h4v2z" />

    </group>

</vector>

iconloaderlib/res/values-night-v31/colors.xml

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

<!--

**

** Copyright 2023, 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.

*/

-->

<resources>

    <color name="themed_icon_color">@android:color/system_accent1_200</color>

    <color name="themed_icon_background_color">@android:color/system_accent1_700</color>

    <color name="themed_badge_icon_color">@android:color/system_accent1_700</color>

    <color name="themed_badge_icon_background_color">@android:color/system_accent1_200</color>

</resources>