commit 5d5935f5d51849d4bf7e90a4e2b52e1a2567b1d8
author Aurimas Liutikas <aurimas@google.com> Thu Feb 16 13:59:27 2017 -0800
committer Aurimas Liutikas <aurimas@google.com> Thu Feb 16 13:59:27 2017 -0800
tree fcf9a37f47d95b7d9a255e6a8ae1881a419b9a93
parent cff24b415dea498a4253df6a8420377b660ae197
parent 2df8a5df92c20df0999755234b544145ca47b77c

resolve merge conflicts of 2df8a5df92 to master

Change-Id: Ie88bbdc8a9551a5558565adedb1344b21f90526b

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 f2790b8..18133be 100644
--- a/design/src/android/support/design/internal/BottomNavigationMenuView.java
+++ b/design/src/android/support/design/internal/BottomNavigationMenuView.java
@@ -51,8 +51,7 @@
     private final int mActiveItemMaxWidth;
     private final int mItemHeight;
     private final OnClickListener mOnClickListener;
-    private static final Pools.Pool<BottomNavigationItemView> sItemPool =
-            new Pools.SynchronizedPool<>(5);
+    private final Pools.Pool<BottomNavigationItemView> mItemPool = new Pools.SynchronizedPool<>(5);
 
     private boolean mShiftingMode = true;
 
@@ -255,12 +254,12 @@
     }
 
     public void buildMenuView() {
+        removeAllViews();
         if (mButtons != null) {
             for (BottomNavigationItemView item : mButtons) {
-                sItemPool.release(item);
+                mItemPool.release(item);
             }
         }
-        removeAllViews();
         if (mMenu.size() == 0) {
             mSelectedItemId = 0;
             mSelectedItemPosition = 0;
@@ -312,7 +311,7 @@
     }
 
     private BottomNavigationItemView getNewItem() {
-        BottomNavigationItemView item = sItemPool.acquire();
+        BottomNavigationItemView item = mItemPool.acquire();
         if (item == null) {
             item = new BottomNavigationItemView(getContext());
         }