Merge branch 'master' into develop

etsy · Feb 22, 2014 · d4d921b · d4d921b
2 parents 3b8575f + 887650a
commit d4d921b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -28,8 +28,11 @@ The library was built for and tested on Android version 2.3.3(SDK 10) and above.
 The simplest way to use AndroidStaggeredGrid is to add the library as a gradle aar dependency to your build. See the [CHANGELOG.md](https://github.com/etsy/AndroidStaggeredGrid/blob/master/CHANGELOG.md) for the latest version number.
 
 ```
-dependencies {
+repositories {
     mavenCentral()
+}
+
+dependencies {
     compile 'com.etsy.android.grid:library:x.x.x' // see changelog
 }
 ```

diff --git a/library/src/main/java/com/etsy/android/grid/StaggeredGridView.java b/library/src/main/java/com/etsy/android/grid/StaggeredGridView.java
@@ -1244,6 +1244,7 @@ public void onRestoreInstanceState(Parcelable state) {
         GridListSavedState ss = (GridListSavedState) state;
         mColumnCount = ss.columnCount;
         mColumnTops = ss.columnTops;
+        mColumnBottoms = new int[mColumnCount];
         mPositionData = ss.positionData;
         mNeedSync = true;
         super.onRestoreInstanceState(ss);