commit 4f0260dab2b1a064ee132dc882d2ca8084e6b2eb
author Aurimas Liutikas <aurimas@google.com> Tue Jan 03 22:30:02 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 03 22:30:02 2017 +0000
tree 5a14cffd309ab3d421417d34c88c38ada9bf43e3
parent d72db70c0e03e270ac89e7e412b7c965b1f902bd
parent 2befdb72bff253ec493612aca2b527da765ae0d1

Fix a crash in clearning BottomNavigationView menu.
am: 2befdb72bf

Change-Id: I04422aa4cd73f1761e5017d335836aa2ca0b6b8c

design/src/android/support/design/internal/BottomNavigationMenuView.java

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()];

design/tests/src/android/support/design/widget/BottomNavigationViewTest.java

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++) {