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

Commit 21e24868 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 

am: 47dbc38d

Change-Id: Ib89f65c44834d7e34342b6b8ef37f4b147466fc8
parents 35481ba0 47dbc38d

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