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

Commit 14a98aa6 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Make sure to remove child views when recreating notification... 

Merge "Merge "Make sure to remove child views when recreating notification menu row" into oc-dev am: 1e943b3e am: 4ba5995a"
parents d66ea5d5 85a85276

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

+3 −0
Original line number Diff line number Diff line
@@ -120,6 +120,9 @@ public class NotificationMenuRow implements NotificationMenuRowPlugin, View.OnCl 
    @Override

    public void createMenu(ViewGroup parent) {

        mParent = (ExpandableNotificationRow) parent;

        if (mMenuContainer != null) {

            mMenuContainer.removeAllViews();

        }

        mMenuContainer = new FrameLayout(mContext);

        for (int i = 0; i < mMenuItems.size(); i++) {

            addMenuView(mMenuItems.get(i), mMenuContainer);

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

+7 −0
Original line number Diff line number Diff line
@@ -44,4 +44,11 @@ public class NotificationMenuRowTest extends LeakCheckedTest { 
        ViewUtils.detachView(row.getMenuView());

        TestableLooper.get(this).processAllMessages();

    }



    @Test

    public void testRecreateMenu() {

        NotificationMenuRowPlugin row = new NotificationMenuRow(mContext);

        row.createMenu(null);

        row.createMenu(null);

    }

}