diff options
| author | Selim Cinek <cinek@google.com> | 2018-06-08 22:51:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-06-08 22:51:07 +0000 |
| commit | 70a9cd292b777ef9bb7e6098cb22f94cba1666ed (patch) | |
| tree | c6d372bef3444bc0cb9b36c3903e1dbefde5d974 | |
| parent | 40e41a6299abf8befb9b9f5ff9861873e7208c74 (diff) | |
| parent | e6065e3f75f372f00088ef404fc03d895e109b84 (diff) | |
| download | base-70a9cd292b777ef9bb7e6098cb22f94cba1666ed.tar.gz | |
Merge "Revert "Consider icon scale when calculating icon offset in shelf"" into pi-dev
| -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 |