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

Commit 6e3a90d9 authored by Mady Mellor's avatar Mady Mellor Committed by Android (Google) Code Review
Browse files

Merge "Fix a crash when setting vertical gear location and content view null" into nyc-dev

parents 94121762 a6edc878

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -1123,6 +1123,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { 
    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {

    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {

        super.onLayout(changed, left, top, right, bottom);

        super.onLayout(changed, left, top, right, bottom);

        updateMaxHeights();

        updateMaxHeights();

        if (mSettingsIconRow != null) {

            mSettingsIconRow.updateVerticalLocation();

        }

    }

    }





    private void updateMaxHeights() {

    private void updateMaxHeights() {

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -244,7 +244,6 @@ public class NotificationSettingsIconRow extends FrameLayout implements View.OnC 
    }

    }





    public void setIconLocation(boolean onLeft) {

    public void setIconLocation(boolean onLeft) {

        updateVerticalLocation();

        if ((mIconPlaced && onLeft == mOnLeft) || mSnapping || mParent == null

        if ((mIconPlaced && onLeft == mOnLeft) || mSnapping || mParent == null

                || mGearIcon.getWidth() == 0) {

                || mGearIcon.getWidth() == 0) {

            // Do nothing

            // Do nothing