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

Commit edb5370b authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10970117 from 40889e01 to 24Q1-release 

Change-Id: If8222a2699ba9bc30bfef3ae92e8bfb9f9927287
parents 3e2b6019 40889e01

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

+1 −0
Original line number Diff line number Diff line
@@ -419,6 +419,7 @@ public class BaseIconFactory implements AutoCloseable { 
        mOldBounds.set(icon.getBounds());



        if (icon instanceof AdaptiveIconDrawable) {

            // We are ignoring KEY_SHADOW_DISTANCE because regular icons ignore this at the moment b/298203449

            int offset = Math.max((int) Math.ceil(BLUR_FACTOR * size),

                    Math.round(size * (1 - scale) / 2));

            // b/211896569: AdaptiveIconDrawable do not work properly for non top-left bounds

iconloaderlib/src/com/android/launcher3/icons/ShadowGenerator.java

+2 −1
Original line number Diff line number Diff line
@@ -109,7 +109,8 @@ public class ShadowGenerator { 
                scale = (HALF_DISTANCE - BLUR_FACTOR) / (HALF_DISTANCE - minSide);

            }



            float bottomSpace = BLUR_FACTOR + KEY_SHADOW_DISTANCE;

            // We are ignoring KEY_SHADOW_DISTANCE because regular icons ignore this at the moment b/298203449

            float bottomSpace = BLUR_FACTOR;

            if (bounds.bottom < bottomSpace) {

                scale = Math.min(scale,

                        (HALF_DISTANCE - bottomSpace) / (HALF_DISTANCE - bounds.bottom));