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

Merge "Update alignment for gear / snooze icons to shift when expanded" into oc-dr1-dev

Browse Source 
am: 0b8a985cd6

Change-Id: Ib8d76ea165032175be98e8c1023af6c973be1ee4
This commit is contained in:
Mady Mellor
2017-07-20 20:28:01 +00:00
committed by android-build-merger
parent 74f09cff14 0b8a985cd6
commit f86be8d22d
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
View File

@@ -1974,6 +1974,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
if (mGuts != null) { if (mGuts != null) {
mGuts.setActualHeight(height); mGuts.setActualHeight(height);
} }
if (mMenuRow.getMenuView() != null) {
mMenuRow.onHeightUpdate();
}
} }
@Override @Override

2
packages/SystemUI/src/com/android/systemui/statusbar/NotificationMenuRow.java
View File

@@ -431,7 +431,7 @@ public class NotificationMenuRow implements NotificationMenuRowPlugin, View.OnCl
if (mParent == null || mMenuItems.size() == 0 || mMenuContainer == null) { if (mParent == null || mMenuItems.size() == 0 || mMenuContainer == null) {
return; return;
} }
int parentHeight = mParent.getCollapsedHeight(); int parentHeight = mParent.getActualHeight();
float translationY; float translationY;
if (parentHeight < mVertSpaceForIcons) { if (parentHeight < mVertSpaceForIcons) {
translationY = (parentHeight / 2) - (mHorizSpaceForIcon / 2); translationY = (parentHeight / 2) - (mHorizSpaceForIcon / 2);