[layouts] Don't apply adapter constraints when restoring items

Fixes #146
lucasr · Oct 29, 2014 · 6030143 · 6030143
1 parent c1488bc
commit 6030143
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/layouts/src/main/java/org/lucasr/twowayview/widget/BaseLayoutManager.java b/layouts/src/main/java/org/lucasr/twowayview/widget/BaseLayoutManager.java
@@ -597,7 +597,7 @@ private LanedSavedState(Parcel in) {
                 itemEntries = new ItemEntries();
                 for (int i = 0; i < itemEntriesCount; i++) {
                     final ItemEntry entry = in.readParcelable(getClass().getClassLoader());
-                    itemEntries.putItemEntry(i, entry);
+                    itemEntries.restoreItemEntry(i, entry);
                 }
             }
         }

diff --git a/layouts/src/main/java/org/lucasr/twowayview/widget/ItemEntries.java b/layouts/src/main/java/org/lucasr/twowayview/widget/ItemEntries.java
@@ -32,14 +32,17 @@ class ItemEntries {
 
     private ItemEntry[] mItemEntries;
     private int mAdapterSize;
+    private boolean mRestoringItem;
 
     private int sizeForPosition(int position) {
         int len = mItemEntries.length;
         while (len <= position) {
             len *= 2;
         }
 
-        if (len > mAdapterSize) {
+        // We don't apply any constraints while restoring
+        // item entries.
+        if (!mRestoringItem && len > mAdapterSize) {
             len = mAdapterSize;
         }
 
@@ -71,6 +74,12 @@ public void putItemEntry(int position, ItemEntry entry) {
         mItemEntries[position] = entry;
     }
 
+    public void restoreItemEntry(int position, ItemEntry entry) {
+        mRestoringItem = true;
+        putItemEntry(position, entry);
+        mRestoringItem = false;
+    }
+
     public int size() {
         return (mItemEntries != null ? mItemEntries.length : 0);
     }