Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure to remove child views when recreating notification menu row

Browse Source 
Test: added NotificationMenuRowTest.testRecreateMenu() + runtest systemui
Bug: 36855649
Change-Id: I4045dc292eb2b5a817ae8d2e78cbce50d4d22b41
This commit is contained in:
Mady Mellor
2017-04-03 11:50:44 -07:00
parent 76d779374a
commit 0df26108c5
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/statusbar/NotificationMenuRow.java
View File

@@ -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);

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

@@ -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);
}
}