From e6065e3f75f372f00088ef404fc03d895e109b84 Mon Sep 17 00:00:00 2001 From: Bill Lin Date: Fri, 8 Jun 2018 17:07:13 +0800 Subject: [PATCH] Revert "Consider icon scale when calculating icon offset in shelf" This reverts commit 5dad60e6928f29d5a959cb4e2fb45e17253ca88c. 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 --- .../src/com/android/systemui/statusbar/NotificationShelf.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java index fac77689e2897..306319903ecb0 100644 --- 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() * icon.getIconScale()); + iconTransformDistance = Math.min(iconTransformDistance, row.getMinHeight() + - getIntrinsicHeight()); } float viewEnd = viewStart + fullHeight; if (expandingAnimated && mAmbientState.getScrollY() == 0