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

Commit f401709e authored by Xin Li's avatar Xin Li
Browse files

Merge tm-dev-plus-aosp-without-vendor@8763363 

Bug: 236760014
Merged-In: I67328c973d97974bcea340943f7ce02c55550d8e
Change-Id: Idb97de13e73ac9581991ab2fc0e0386dbab1affd
parents 0c4c3bd8 5404e557

iconloaderlib/res/drawable/ic_work_app_badge.xml

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

<!-- Copyright (C) 2021 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="@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:fillColor="#1A73E8"

            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/src/com/android/launcher3/icons/BaseIconFactory.java

+167 −139

File changed.

Preview size limit exceeded, changes collapsed.

iconloaderlib/src/com/android/launcher3/icons/BitmapInfo.java

+91 −68

File changed.

Preview size limit exceeded, changes collapsed.

iconloaderlib/src/com/android/launcher3/icons/ClockDrawableWrapper.java

+192 −132

File changed.

Preview size limit exceeded, changes collapsed.

iconloaderlib/src/com/android/launcher3/icons/DotRenderer.java

+5 −2
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ public class DotRenderer { 


        mCirclePaint.setColor(Color.BLACK);

        canvas.drawBitmap(mBackgroundWithShadow, mBitmapOffset, mBitmapOffset, mCirclePaint);

        mCirclePaint.setColor(params.color);

        mCirclePaint.setColor(params.dotColor);

        canvas.drawCircle(0, 0, mCircleRadius, mCirclePaint);

        canvas.restore();

    }
@@ -133,7 +133,10 @@ public class DotRenderer { 
    public static class DrawParams {

        /** The color (possibly based on the icon) to use for the dot. */

        @ViewDebug.ExportedProperty(category = "notification dot", formatToHexString = true)

        public int color;

        public int dotColor;

        /** The color (possibly based on the icon) to use for a predicted app. */

        @ViewDebug.ExportedProperty(category = "notification dot", formatToHexString = true)

        public int appColor;

        /** The bounds of the icon that the dot is drawn on top of. */

        @ViewDebug.ExportedProperty(category = "notification dot")

        public Rect iconBounds = new Rect();