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

This reverts commit 5dad60e692.
The patch may cause latest Notification do not align center
Bug: 109868942
Test: atest & manual use notify observe only last 1 notification visual

Change-Id: I81e5de4d0a2822c96ce9a815519bb0413f26f27c
This commit is contained in:
Bill Lin
2018-06-08 17:07:13 +08:00
parent 551328eaaa
commit e6065e3f75

View File

@@ -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