From 52b65d39aaa378c5bec389a1e8a977ec3ec6a522 Mon Sep 17 00:00:00 2001 From: Gilles Debunne Date: Mon, 1 Mar 2010 10:54:51 -0800 Subject: Take headers into account when expanding a ExpListView group. The possible scroll that happen after expanding a group did not take the possible existing headers into account. Change-Id: I5dc381baa7c54580e992e26a1ed55102afcb16b0 --- core/java/android/widget/ExpandableListView.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/java/android/widget/ExpandableListView.java b/core/java/android/widget/ExpandableListView.java index 79abd4bebace..9cc8bd50584a 100644 --- 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; -- cgit v1.2.3-59-g8ed1b