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

Commit 6d480a94 authored by Miranda Kephart's avatar Miranda Kephart Committed by Android (Google) Code Review
Browse files

Merge "Don't show nested badge for work profile direct share targets"

parents ee5a30d5 f50afcba

core/java/com/android/internal/app/ResolverListAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -923,7 +923,7 @@ public class ResolverListAdapter extends BaseAdapter { 
            return new BitmapDrawable(mCtx.getResources(), getIconBitmap(userHandle));

        }



        public Bitmap getIconBitmap(UserHandle userHandle) {

        public Bitmap getIconBitmap(@Nullable UserHandle userHandle) {

            Drawable dr = null;

            if (mHasSubstitutePermission) {

                dr = getIconSubstituteInternal();

core/java/com/android/internal/app/SimpleIconFactory.java

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ public class SimpleIconFactory { 
     * @deprecated Do not use, functionality will be replaced by iconloader lib eventually.

     */

    @Deprecated

    Bitmap createUserBadgedIconBitmap(@Nullable Drawable icon, UserHandle user) {

    Bitmap createUserBadgedIconBitmap(@Nullable Drawable icon, @Nullable UserHandle user) {

        float [] scale = new float[1];



        // If no icon is provided use the system default

core/java/com/android/internal/app/chooser/SelectableTargetInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ public final class SelectableTargetInfo implements ChooserTargetInfo { 


        // Now fetch app icon and raster with no badging even in work profile

        Bitmap appIcon = mSelectableTargetInfoCommunicator.makePresentationGetter(info)

                .getIconBitmap(mContext.getUser());

                .getIconBitmap(null);



        // Raster target drawable with appIcon as a badge

        SimpleIconFactory sif = SimpleIconFactory.obtain(mContext);