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

Commit 0d74be5e authored by Mady Mellor's avatar Mady Mellor Committed by android-build-merger
Browse files

Merge "If the menu hasn't been created yet don't do things with it" into oc-dr1-dev 

am: 214baa03

Change-Id: Id0422df61723072291d37a6b19dc8bf783c8d2d8
parents a6780419 214baa03

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

+2 −2
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ public class NotificationMenuRow implements NotificationMenuRowPlugin, View.OnCl 


    @Override

    public void onHeightUpdate() {

        if (mParent == null || mMenuItems.size() == 0) {

        if (mParent == null || mMenuItems.size() == 0 || mMenuContainer == null) {

            return;

        }

        int parentHeight = mParent.getCollapsedHeight();
@@ -477,7 +477,7 @@ public class NotificationMenuRow implements NotificationMenuRowPlugin, View.OnCl 


    private void setMenuLocation() {

        boolean showOnLeft = mTranslation > 0;

        if ((mIconsPlaced && showOnLeft == mOnLeft) || mSnapping

        if ((mIconsPlaced && showOnLeft == mOnLeft) || mSnapping || mMenuContainer == null

                || !mMenuContainer.isAttachedToWindow()) {

            // Do nothing

            return;

packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationMenuRowTest.java

+6 −0
Original line number Diff line number Diff line
@@ -57,4 +57,10 @@ public class NotificationMenuRowTest extends LeakCheckedTest { 
        row.createMenu(null, null);

        assertTrue(row.getMenuView() != null);

    }



    @Test

    public void testResetUncreatedMenu() {

        NotificationMenuRowPlugin row = new NotificationMenuRow(mContext);

        row.resetMenu();

    }

}