Merge pull request #33 from AAkira/v1.4.1

V1.4.1
AAkira · Dec 8, 2015 · c14433c · c14433c
2 parents fed3ca5 + 13c4495
commit c14433c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -229,7 +229,7 @@ buildscript {
 }
 
 dependencies {
-	compile 'com.github.aakira:expandable-layout:1.4.0@aar'
+	compile 'com.github.aakira:expandable-layout:1.4.1@aar'
 }
 ```
 

diff --git a/gradle.properties b/gradle.properties
@@ -2,8 +2,8 @@ COMPILE_SDK_VERSION=23
 BUILD_TOOLS_VERSION=22.0.1
 MIN_SDK_VERSION=11
 TARGET_SDK_VERSION=23
-VERSION_CODE=5
-VERSION_NAME=1.4.0
+VERSION_CODE=6
+VERSION_NAME=1.4.1
 
 SUPPORT_APP_COMPAT_VERSION=23.0.1
 

diff --git a/library/src/main/java/com/github/aakira/expandablelayout/ExpandableRelativeLayout.java b/library/src/main/java/com/github/aakira/expandablelayout/ExpandableRelativeLayout.java
@@ -109,7 +109,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
                 }
                 childPositionList.add(sumSize + childSize + childMargin);
             }
-            layoutSize = getCurrentPosition();
+            layoutSize = childPositionList.get(childPositionList.size() - 1);
 
             if (0 < layoutSize) {
                 isCalculatedSize = true;
-Original file line number
+Diff line change
@@ Expand Up / @@ -229,7 +229,7 @@ buildscript { @@
     }
     dependencies {
-    	compile 'com.github.aakira:expandable-layout:1.4.0@aar'
+    	compile 'com.github.aakira:expandable-layout:1.4.1@aar'
     }
     ```
@@ Expand Down @@