Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Selim Cinek
2018-06-08 22:51:07 +00:00
committed by Android (Google) Code Review
parent 40e41a6299 e6065e3f75
commit 70a9cd292b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
View File

@@ -482,8 +482,8 @@ public class NotificationShelf extends ActivatableNotificationView implements
iconTransformDistance = Math.min(iconTransformDistance, fullHeight); iconTransformDistance = Math.min(iconTransformDistance, fullHeight);
if (isLastChild) { if (isLastChild) {
fullHeight = Math.min(fullHeight, row.getMinHeight() - getIntrinsicHeight()); fullHeight = Math.min(fullHeight, row.getMinHeight() - getIntrinsicHeight());
iconTransformDistance = Math.min(iconTransformDistance, iconTransformDistance = Math.min(iconTransformDistance, row.getMinHeight()
row.getMinHeight() - getIntrinsicHeight() * icon.getIconScale()); - getIntrinsicHeight());
} }
float viewEnd = viewStart + fullHeight; float viewEnd = viewStart + fullHeight;
if (expandingAnimated && mAmbientState.getScrollY() == 0 if (expandingAnimated && mAmbientState.getScrollY() == 0