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

Commit fdbc313a authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Revert "Consider icon scale when calculating icon offset in shelf""... 

Merge "Revert "Consider icon scale when calculating icon offset in shelf"" into pi-dev am: 70a9cd29
am: 1a37d5fc

Change-Id: I15e25c686c21f8bcadd3adc714c7ea5c2b400e12
parents 3bf4596b 1a37d5fc

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

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

        iconTransformDistance = Math.min(iconTransformDistance, fullHeight);

        if (isLastChild) {

        if (isLastChild) {

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

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

            iconTransformDistance = Math.min(iconTransformDistance,

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

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

                    - getIntrinsicHeight());

        }

        }

        float viewEnd = viewStart + fullHeight;

        float viewEnd = viewStart + fullHeight;

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

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