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

Commit 1d68980c authored by Sihua Ma's avatar Sihua Ma Committed by Automerger Merge Worker
Browse files

Merge "Attach work badge to Weather and Battery widgets" into tm-dev am: 34ba5a95 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17691442



Change-Id: I0a110ee4f142a79d941b175172ea0e904d591c47
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d9319683 34ba5a95

src/com/android/launcher3/icons/IconCache.java

+37 −6
Original line number Diff line number Diff line
@@ -42,8 +42,10 @@ import android.os.Trace; 
import android.os.UserHandle;

import android.text.TextUtils;

import android.util.Log;

import android.util.SparseArray;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.core.util.Pair;



import com.android.launcher3.InvariantDeviceProfile;
@@ -94,6 +96,8 @@ public class IconCache extends BaseIconCache { 
    private final InstantAppResolver mInstantAppResolver;

    private final IconProvider mIconProvider;



    private final SparseArray<BitmapInfo> mWidgetCategoryBitmapInfos;



    private int mPendingIconRequestCount = 0;



    public IconCache(Context context, InvariantDeviceProfile idp) {
@@ -111,6 +115,7 @@ public class IconCache extends BaseIconCache { 
        mUserManager = UserCache.INSTANCE.get(mContext);

        mInstantAppResolver = InstantAppResolver.newInstance(mContext);

        mIconProvider = iconProvider;

        mWidgetCategoryBitmapInfos = new SparseArray<>();

    }



    @Override
@@ -477,13 +482,39 @@ public class IconCache extends BaseIconCache { 
        CacheEntry entry = getEntryForPackageLocked(

                infoInOut.packageName, infoInOut.user, useLowResIcon);

        applyCacheEntry(entry, infoInOut);

        if (infoInOut.widgetCategory != NO_CATEGORY) {

        if (infoInOut.widgetCategory == NO_CATEGORY) {

            return;

        }



        WidgetSection widgetSection = WidgetSections.getWidgetSections(mContext)

                .get(infoInOut.widgetCategory);

        infoInOut.title = mContext.getString(widgetSection.mSectionTitle);

        infoInOut.contentDescription = mPackageManager.getUserBadgedLabel(

                infoInOut.title, infoInOut.user);

        final BitmapInfo cachedBitmap = mWidgetCategoryBitmapInfos.get(infoInOut.widgetCategory);

        if (cachedBitmap != null) {

            infoInOut.bitmap = getBadgedIcon(cachedBitmap, infoInOut.user);

            return;

        }



        try (LauncherIcons li = LauncherIcons.obtain(mContext)) {

            final BitmapInfo tempBitmap = li.createBadgedIconBitmap(

                    mContext.getDrawable(widgetSection.mSectionDrawable),

                    new BaseIconFactory.IconOptions().setShrinkNonAdaptiveIcons(false));

            mWidgetCategoryBitmapInfos.put(infoInOut.widgetCategory, tempBitmap);

            infoInOut.bitmap = getBadgedIcon(tempBitmap, infoInOut.user);

        } catch (Exception e) {

            Log.e(TAG, "Error initializing bitmap for icons with widget category", e);

        }



    }



    private synchronized BitmapInfo getBadgedIcon(@Nullable final BitmapInfo bitmap,

            @NonNull final UserHandle user) {

        if (bitmap == null) {

            return getDefaultIcon(user);

        }

        return bitmap.withFlags(getUserFlagOpLocked(user));

    }



    protected void applyCacheEntry(CacheEntry entry, ItemInfoWithIcon info) {

src/com/android/launcher3/widget/PendingAppWidgetHostView.java

+1 −4
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.launcher3.widget; 


import static com.android.launcher3.graphics.PreloadIconDrawable.newPendingIcon;

import static com.android.launcher3.icons.FastBitmapDrawable.getDisabledColorFilter;

import static com.android.launcher3.widget.WidgetSections.getWidgetSections;



import android.content.Context;

import android.graphics.Canvas;
@@ -341,8 +340,6 @@ public class PendingAppWidgetHostView extends LauncherAppWidgetHostView 
        if (mInfo.pendingItemInfo.widgetCategory == WidgetSections.NO_CATEGORY) {

            return null;

        }

        Context context = getContext();

        return context.getDrawable(getWidgetSections(context).get(

                mInfo.pendingItemInfo.widgetCategory).mSectionDrawable);

        return mInfo.pendingItemInfo.newIcon(getContext());

    }

}

src/com/android/launcher3/widget/picker/WidgetsListHeader.java

+1 −10
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */

package com.android.launcher3.widget.picker;



import static com.android.launcher3.widget.WidgetSections.NO_CATEGORY;



import android.content.Context;

import android.content.res.Resources;
@@ -43,8 +42,6 @@ import com.android.launcher3.model.data.ItemInfoWithIcon; 
import com.android.launcher3.model.data.PackageItemInfo;

import com.android.launcher3.util.PluralMessageFormat;

import com.android.launcher3.views.ActivityContext;

import com.android.launcher3.widget.WidgetSections;

import com.android.launcher3.widget.WidgetSections.WidgetSection;

import com.android.launcher3.widget.model.WidgetsListHeaderEntry;

import com.android.launcher3.widget.model.WidgetsListSearchHeaderEntry;
@@ -177,13 +174,7 @@ public final class WidgetsListHeader extends LinearLayout implements ItemInfoUpd 


    private void setIcon(PackageItemInfo info) {

        Drawable icon;

        if (info.widgetCategory == NO_CATEGORY) {

        icon = info.newIcon(getContext());

        } else {

            WidgetSection widgetSection = WidgetSections.getWidgetSections(getContext())

                    .get(info.widgetCategory);

            icon = getContext().getDrawable(widgetSection.mSectionDrawable);

        }

        applyDrawables(icon);

        mIconDrawable = icon;

        if (mIconDrawable != null) {