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

Commit cdd17a94 authored by Sunny Goyal's avatar Sunny Goyal Committed by Android Build Coastguard Worker
Browse files

Always have the current iconShape in BaseIconFactory irrespective of full-bleed setting. 

This change was lost when resolving merge conflict

Bug: 427109551
Flag: EXEMPT bugfix
Test: Verified manually on device
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a9cb3d37ee4924b2ad0e44956e04d5cbd7265988)
Merged-In: I3b30700efe54b1820d0fe0383250a837b0f30292
Change-Id: I3b30700efe54b1820d0fe0383250a837b0f30292
parent fd35cf27

iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.kt

+6 −8
Original line number Diff line number Diff line
@@ -83,8 +83,6 @@ constructor( 


    /** Default IconShape for when custom shape is not needed */

    val defaultIconShape: IconShape by lazy {

        if (!drawFullBleedIcons) IconShape.EMPTY

        else

        generateIconShape(

            iconBitmapSize,

            AdaptiveIconDrawable(ColorDrawable(Color.BLACK), null)