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 
am: 70a9cd292b

Change-Id: If6d1ec275a8734c1f4c891598aa4c6265cda7ae3
This commit is contained in:
Selim Cinek
2018-06-08 16:07:23 -07:00
committed by android-build-merger
parent 62a098c7e3 70a9cd292b
commit 1a37d5fcb9
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);
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