Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e4bf845 authored by Mady Mellor's avatar Mady Mellor Committed by android-build-merger
Browse files

Merge "Update alignment for gear / snooze icons to shift when expanded" into... 

Merge "Update alignment for gear / snooze icons to shift when expanded" into oc-dr1-dev am: 0b8a985c am: dbb5c984
am: e95503d2

Change-Id: I8368b23b3bf5df24000c2494fe7dd4e9ce9c779f
parents 0c574f70 e95503d2

packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java

+3 −0
Original line number Diff line number Diff line
@@ -1974,6 +1974,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
        if (mGuts != null) {

            mGuts.setActualHeight(height);

        }

        if (mMenuRow.getMenuView() != null) {

            mMenuRow.onHeightUpdate();

        }

    }



    @Override

packages/SystemUI/src/com/android/systemui/statusbar/NotificationMenuRow.java

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ public class NotificationMenuRow implements NotificationMenuRowPlugin, View.OnCl 
        if (mParent == null || mMenuItems.size() == 0 || mMenuContainer == null) {

            return;

        }

        int parentHeight = mParent.getCollapsedHeight();

        int parentHeight = mParent.getActualHeight();

        float translationY;

        if (parentHeight < mVertSpaceForIcons) {

            translationY = (parentHeight / 2) - (mHorizSpaceForIcon / 2);