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

Commit a7996e1f authored by Sunny Goyal's avatar Sunny Goyal Committed by Automerger Merge Worker
Browse files

Merge "Updating icon loader method calls as per signature change" into... 

Merge "Updating icon loader method calls as per signature change" into tm-qpr-dev am: 1cc345ab am: 5b202679

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20039928



Change-Id: Iee9cabe57b856959d4d8223da16bacb2b85e072d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aa9db969 5b202679

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);