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

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

Merge "Updating icon loader method calls as per signature change" into tm-qpr-dev

parents daa7365e d60ae092

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleBadgeIconFactory.java

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public class BubbleBadgeIconFactory extends BaseIconFactory { 
            userBadgedAppIcon = new CircularRingDrawable(userBadgedAppIcon);

        }

        Bitmap userBadgedBitmap = createIconBitmap(

                userBadgedAppIcon, 1, BITMAP_GENERATION_MODE_WITH_SHADOW);

                userBadgedAppIcon, 1, MODE_WITH_SHADOW);

        return createIconBitmap(userBadgedBitmap);

    }

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleIconFactory.java

+1 −1
Original line number Diff line number Diff line
@@ -79,6 +79,6 @@ public class BubbleIconFactory extends BaseIconFactory { 
                true /* shrinkNonAdaptiveIcons */,

                null /* outscale */,

                outScale);

        return createIconBitmap(icon, outScale[0], BITMAP_GENERATION_MODE_WITH_SHADOW);

        return createIconBitmap(icon, outScale[0], MODE_WITH_SHADOW);

    }

}

libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenContentDrawer.java

+2 −1
Original line number Diff line number Diff line
@@ -432,7 +432,8 @@ public class SplashscreenContentDrawer { 
                    final ShapeIconFactory factory = new ShapeIconFactory(

                            SplashscreenContentDrawer.this.mContext,

                            scaledIconDpi, mFinalIconSize);

                    final Bitmap bitmap = factory.createScaledBitmapWithoutShadow(iconDrawable);

                    final Bitmap bitmap = factory.createScaledBitmap(iconDrawable,

                            BaseIconFactory.MODE_DEFAULT);

                    Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);

                    createIconDrawable(new BitmapDrawable(bitmap), true,

                            mHighResIconProvider.mLoadInDetail);