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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-27 17:45:48 +00:00
committed by Android (Google) Code Review
parent 21c7490f20 0b3f004acb
commit 214baa034a
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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