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

Commit 47dbc38d authored by Evan Laird's avatar Evan Laird Committed by android-build-merger
Browse files

Merge "Consider icon scale when calculating icon offset in shelf" into pi-dev 

am: 00c132cd

Change-Id: Id9fab2c7242fe202209580af74c3ba84eb5d7caa
parents 52779174 00c132cd

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java

+2 −2
Original line number Diff line number Diff line
@@ -482,8 +482,8 @@ public class NotificationShelf extends ActivatableNotificationView implements 
        iconTransformDistance = Math.min(iconTransformDistance, fullHeight);

        if (isLastChild) {

            fullHeight = Math.min(fullHeight, row.getMinHeight() - getIntrinsicHeight());

            iconTransformDistance = Math.min(iconTransformDistance, row.getMinHeight()

                    - getIntrinsicHeight());

            iconTransformDistance = Math.min(iconTransformDistance,

                    row.getMinHeight() - getIntrinsicHeight() * icon.getIconScale());

        }

        float viewEnd = viewStart + fullHeight;

        if (expandingAnimated && mAmbientState.getScrollY() == 0