commit | 18cba343e69e8e8f657348daaa42998022d1eb6c | [log] [tgz] |
---|---|---|
author | Aurimas Liutikas <aurimas@google.com> | Tue Jan 03 22:18:05 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jan 03 22:18:05 2017 +0000 |
tree | 14beb3fdea520454c7388a91e3a7e007bee310bb | |
parent | b07a54e4f56e2f681b76aa36cc8cc5a746da4ea0 [diff] | |
parent | 2befdb72bff253ec493612aca2b527da765ae0d1 [diff] |
Merge "Fix a crash in clearning BottomNavigationView menu." into nyc-support-25.1-dev
diff --git a/design/src/android/support/design/internal/BottomNavigationMenuView.java b/design/src/android/support/design/internal/BottomNavigationMenuView.java index bc73970..82d983e 100644 --- a/design/src/android/support/design/internal/BottomNavigationMenuView.java +++ b/design/src/android/support/design/internal/BottomNavigationMenuView.java
@@ -255,6 +255,7 @@ } removeAllViews(); if (mMenu.size() == 0) { + mButtons = null; return; } mButtons = new BottomNavigationItemView[mMenu.size()];
diff --git a/design/tests/src/android/support/design/widget/BottomNavigationViewTest.java b/design/tests/src/android/support/design/widget/BottomNavigationViewTest.java index 37a58a6..f06a85a 100644 --- a/design/tests/src/android/support/design/widget/BottomNavigationViewTest.java +++ b/design/tests/src/android/support/design/widget/BottomNavigationViewTest.java
@@ -223,6 +223,16 @@ checkAndVerifyExclusiveItem(menu, R.id.destination_people); } + @UiThreadTest + @Test + @SmallTest + public void testClearingMenu() throws Throwable { + mBottomNavigation.getMenu().clear(); + assertEquals(0, mBottomNavigation.getMenu().size()); + mBottomNavigation.inflateMenu(R.menu.bottom_navigation_view_content); + assertEquals(3, mBottomNavigation.getMenu().size()); + } + private void checkAndVerifyExclusiveItem(final Menu menu, final int id) throws Throwable { menu.findItem(id).setChecked(true); for (int i = 0; i < menu.size(); i++) {