merge conflict

yuzhiqiang400 · Jul 8, 2013 · c5a7862 · c5a7862
2 parents 90cda5b + 3b3f390
commit c5a7862
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/com/origamilabs/library/views/StaggeredGridView.java b/src/com/origamilabs/library/views/StaggeredGridView.java
@@ -1295,6 +1295,9 @@ final int fillUp(int fromPosition, int overhang) {
         int highestView = getHeight();
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 3b3f390ecfad60b228ff4967ab6c932cf2a10e68
         for (int i = 0; i < mColCount; i++) {
 =======
         for (int i = 0; i < mColCount;) {
@@ -1694,10 +1697,13 @@ public void setAdapter(ListAdapter adapter) {
         clearAllState();
         mAdapter = adapter;
         mDataChanged = true;
+<<<<<<< HEAD
 <<<<<<< HEAD
         mItemCount = adapter != null ? adapter.getCount() : 0;
 =======
 >>>>>>> a9050176a6f84f5ca399e2afdc8d627882bf842e
+=======
+>>>>>>> 3b3f390ecfad60b228ff4967ab6c932cf2a10e68
 
         if (adapter != null) {
             adapter.registerDataSetObserver(mObserver);
@@ -2126,10 +2132,13 @@ private SavedState(Parcel in) {
             in.createIntArray(topOffsets);
             in.readTypedList(mapping, ColMap.CREATOR);
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 >>>>>>> 57a89f63166270cbfa981ca33ed7300280e65263
 =======
 >>>>>>> a9050176a6f84f5ca399e2afdc8d627882bf842e
+=======
+>>>>>>> 3b3f390ecfad60b228ff4967ab6c932cf2a10e68
         }
 
         @Override
@@ -2279,7 +2288,6 @@ public void run() {
                     	child.setPressed(true);
 
                         setPressed(true);
-                        layoutChildren(true);
                         positionSelector(mMotionPosition, child);
                         refreshDrawableState();