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

am: 00c132cd35 Change-Id: Id9fab2c7242fe202209580af74c3ba84eb5d7caa
2018-06-06 08:20:38 -07:00
parent 52779174be 00c132cd35
commit 47dbc38d5f
1 changed files with 2 additions and 2 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
@@ -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