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

Commit 00c132cd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents bc6f64d5 5dad60e6

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