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

Commit 70a9cd29 authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

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

parents 40e41a62 e6065e3f

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() * icon.getIconScale());

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

                    - getIntrinsicHeight());

        }

        float viewEnd = viewStart + fullHeight;

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