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

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

Browse Source 
am: 00c132cd35

Change-Id: Id9fab2c7242fe202209580af74c3ba84eb5d7caa
This commit is contained in:
Evan Laird
2018-06-06 08:20:38 -07:00
committed by android-build-merger
parent 52779174be 00c132cd35
commit 47dbc38d5f
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, row.getMinHeight() iconTransformDistance = Math.min(iconTransformDistance,
- getIntrinsicHeight()); row.getMinHeight() - getIntrinsicHeight() * icon.getIconScale());
} }
float viewEnd = viewStart + fullHeight; float viewEnd = viewStart + fullHeight;
if (expandingAnimated && mAmbientState.getScrollY() == 0 if (expandingAnimated && mAmbientState.getScrollY() == 0