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

Commit 54c707bd authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Revert "Creating a custom drawable for user badge" 

Revert submission 25483550-themed-badge

Reason for revert: b/314097390

Reverted changes: /q/submissionid:25483550-themed-badge

Change-Id: I883b1cc87aedbb32f4d2d237234ac1b5bd060201
parent 0259d5ed

iconloaderlib/res/drawable/ic_clone_app_badge.xml

+16 −5
Original line number Diff line number Diff line
@@ -17,16 +17,27 @@ 
    android:width="@dimen/profile_badge_size"

    android:height="@dimen/profile_badge_size"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="#ff3C4043">

    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="@android:color/white"

        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="#FFFFFFFF"/>

        android:fillColor="#ff3C4043"/>

    <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="#FFFFFFFF"

        android:fillColor="#ff3C4043"

        android:fillType="evenOdd"/>

    </group>

</vector>

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

+6 −3
Original line number Diff line number Diff line
@@ -17,11 +17,14 @@ 
    android:width="@dimen/profile_badge_size"

    android:height="@dimen/profile_badge_size"

    android:viewportWidth="18"

    android:viewportHeight="18"

    android:tint="@android:color/black">

    android:viewportHeight="18">



    <path

        android:fillColor="#FFFFFFFF"

        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: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_private_profile_app_badge.xml

+10 −4
Original line number Diff line number Diff line
@@ -17,10 +17,16 @@ 
        android:width="@dimen/profile_badge_size"

        android:height="@dimen/profile_badge_size"

        android:viewportWidth="24"

        android:viewportHeight="24"

        android:tint="#001A41">

        android:viewportHeight="24">

    <path

        android:pathData="M12,0L12,0A12,12 0,0 1,24 12L24,12A12,12 0,0 1,12 24L12,24A12,12 0,0 1,0 12L0,12A12,12 0,0 1,12 0z"

        android:fillColor="#ffffff"/>

    <group>

        <clip-path

            android:pathData="M5,5h14v14h-14z"/>

        <path

            android:pathData="M11.033,14H12.967L12.6,11.85C12.789,11.75 12.933,11.606 13.033,11.417C13.144,11.228 13.2,11.022 13.2,10.8C13.2,10.467 13.083,10.183 12.85,9.95C12.617,9.717 12.333,9.6 12,9.6C11.667,9.6 11.383,9.717 11.15,9.95C10.917,10.183 10.8,10.467 10.8,10.8C10.8,11.022 10.85,11.228 10.95,11.417C11.061,11.606 11.211,11.75 11.4,11.85L11.033,14ZM12,18.4C10.5,18.033 9.256,17.183 8.267,15.85C7.289,14.517 6.8,13.039 6.8,11.417V7.6L12,5.6L17.2,7.6V11.417C17.2,13.039 16.706,14.517 15.717,15.85C14.739,17.183 13.5,18.033 12,18.4ZM12,17.15C13.156,16.794 14.111,16.078 14.867,15C15.622,13.922 16,12.728 16,11.417V8.417L12,6.883L8,8.417V11.417C8,12.728 8.378,13.922 9.133,15C9.889,16.078 10.844,16.794 12,17.15Z"

        android:fillColor="#FFFFFFFF"/>

            android:fillColor="#001A41"/>

    </group>

</vector>