commit 02751a77fb12b65fefb307b715967efa854620d4
author Craig Stout <cstout@google.com> Wed May 28 15:47:01 2014 -0700
committer Craig Stout <cstout@google.com> Wed May 28 17:12:37 2014 -0700
tree 6a57d11887394cb47f2a9a66cb1eeae1ea314ec1
parent cadaa498d53f6b3d9f663e12c1c3b85ac2e93bdc

Fix RecyclerView caching.

b/15314857

Change-Id: I005d709e877d3433a1d52aa8af3480d4f1a18323

v7/recyclerview/src/android/support/v7/widget/RecyclerView.java

diff --git a/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java b/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java
index 73a9e62..f97fa51 100644
--- a/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java
+++ b/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java
@@ -2519,8 +2519,8 @@
                         "Scrapped or attached views may not be recycled.");
             }
 
-            if (mCachedViews.size() < mViewCacheMax && !holder.isInvalid() &&
-                    (mInPreLayout || !holder.isRemoved())) {
+            boolean cached = false;
+            if (!holder.isInvalid() && (mInPreLayout || !holder.isRemoved())) {
                 // Retire oldest cached views first
                 if (mCachedViews.size() == mViewCacheMax && !mCachedViews.isEmpty()) {
                     for (int i = 0; i < mCachedViews.size(); i++) {
@@ -2533,8 +2533,12 @@
                         }
                     }
                 }
-                mCachedViews.add(holder);
-            } else if (holder.isRecyclable()) {
+                if (mCachedViews.size() < mViewCacheMax) {
+                    mCachedViews.add(holder);
+                    cached = true;
+                }
+            }
+            if (!cached && holder.isRecyclable()) {
                 getRecycledViewPool().putRecycledView(holder);
                 dispatchViewRecycled(holder);
             }