diff options
| author | Bill Lin <lbill@google.com> | 2018-06-08 17:07:13 +0800 |
|---|---|---|
| committer | Bill Lin <lbill@google.com> | 2018-06-08 12:02:46 +0000 |
| commit | e6065e3f75f372f00088ef404fc03d895e109b84 (patch) | |
| tree | 54d47f02f146aa5f1fbfd95057d88be78653e1dc | |
| parent | 551328eaaa90e770076079a80f8c4e4565787493 (diff) | |
| download | base-e6065e3f75f372f00088ef404fc03d895e109b84.tar.gz | |
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
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java | 4 |
1 files 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 fac77689e289..306319903ecb 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 |