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

Commit 9217b5f3 authored by Tracy Zhou's avatar Tracy Zhou Committed by Automerger Merge Worker
Browse files

Merge "Use adaptive icon in Settings" into rvc-dev am: 80b01695 am:... 

Merge "Use adaptive icon in Settings" into rvc-dev am: 80b01695 am: c49a01b2 am: c34ab5e9 am: c0b87c59

Change-Id: I0da1284f633beb8fecb59f62e3c85e272a33785f
parents 424cd705 c0b87c59

packages/SettingsLib/src/com/android/settingslib/Utils.java

+10 −10
Original line number Original line Diff line number Diff line
@@ -29,8 +29,6 @@ import android.telephony.AccessNetworkConstants; 
import android.telephony.NetworkRegistrationInfo;

import android.telephony.NetworkRegistrationInfo;

import android.telephony.ServiceState;

import android.telephony.ServiceState;





import androidx.annotation.NonNull;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.UserIcons;

import com.android.internal.util.UserIcons;

import com.android.launcher3.icons.IconFactory;

import com.android.launcher3.icons.IconFactory;
@@ -457,19 +455,21 @@ public class Utils { 
        return state;

        return state;

    }

    }





    /**

    /** Get the corresponding adaptive icon drawable. */

     * Get the {@link Drawable} that represents the app icon

    public static Drawable getBadgedIcon(Context context, Drawable icon, UserHandle user) {

     */

    public static @NonNull Drawable getBadgedIcon(

            @NonNull Context context, @NonNull ApplicationInfo appInfo) {

        final UserHandle user = UserHandle.getUserHandleForUid(appInfo.uid);

        try (IconFactory iconFactory = IconFactory.obtain(context)) {

        try (IconFactory iconFactory = IconFactory.obtain(context)) {

            final Bitmap iconBmp = iconFactory.createBadgedIconBitmap(

            final Bitmap iconBmp = iconFactory.createBadgedIconBitmap(icon, user,

                    appInfo.loadUnbadgedIcon(context.getPackageManager()), user, false).icon;

                    true /* shrinkNonAdaptiveIcons */).icon;

            return new BitmapDrawable(context.getResources(), iconBmp);

            return new BitmapDrawable(context.getResources(), iconBmp);

        }

        }

    }

    }





    /** Get the {@link Drawable} that represents the app icon */

    public static Drawable getBadgedIcon(Context context, ApplicationInfo appInfo) {

        return getBadgedIcon(context, appInfo.loadUnbadgedIcon(context.getPackageManager()),

                UserHandle.getUserHandleForUid(appInfo.uid));

    }



    private static boolean isNotInIwlan(ServiceState serviceState) {

    private static boolean isNotInIwlan(ServiceState serviceState) {

        final NetworkRegistrationInfo networkRegWlan = serviceState.getNetworkRegistrationInfo(

        final NetworkRegistrationInfo networkRegWlan = serviceState.getNetworkRegistrationInfo(

                NetworkRegistrationInfo.DOMAIN_PS,

                NetworkRegistrationInfo.DOMAIN_PS,

packages/SettingsLib/src/com/android/settingslib/accounts/AuthenticatorHelper.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -32,6 +32,8 @@ import android.os.AsyncTask; 
import android.os.UserHandle;

import android.os.UserHandle;

import android.util.Log;

import android.util.Log;





import com.android.settingslib.Utils;



import java.util.ArrayList;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.HashMap;

import java.util.Map;

import java.util.Map;
@@ -116,7 +118,7 @@ final public class AuthenticatorHelper extends BroadcastReceiver { 
        if (icon == null) {

        if (icon == null) {

            icon = context.getPackageManager().getDefaultActivityIcon();

            icon = context.getPackageManager().getDefaultActivityIcon();

        }

        }

        return icon;

        return Utils.getBadgedIcon(mContext, icon, mUserHandle);

    }

    }





    /**

    /**