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

Commit dbb5c984 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 oc-dr1-dev 

am: 0b8a985c

Change-Id: I94d7856d107dbf0d16f008e131fa09b7b78f748e
parents e7faf1a9 0b8a985c

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -1973,6 +1973,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

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -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);