Merge "Take headers into account when expanding a ExpListView group."

2010-03-01 11:55:25 -08:00
parent 54330c311c 52b65d39aa
commit a2af5bc9ea
1 changed files with 4 additions and 3 deletions
--- a/core/java/android/widget/ExpandableListView.java
+++ b/core/java/android/widget/ExpandableListView.java
@@ -547,9 +547,10 @@ public class ExpandableListView extends ListView {
                
                final int groupPos = posMetadata.position.groupPos;
                final int groupFlatPos = posMetadata.position.flatListPos;
-                
-                smoothScrollToPosition(groupFlatPos + mAdapter.getChildrenCount(groupPos),
-                        groupFlatPos);
+
+                final int shiftedGroupPosition = groupFlatPos + getHeaderViewsCount(); 
+                smoothScrollToPosition(shiftedGroupPosition + mAdapter.getChildrenCount(groupPos),
+                        shiftedGroupPosition);
            }

            returnValue = true;