Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7e5e3745: Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.

Browse Source 
Merge commit '7e5e3745cf0103219a13071fbd488c3c01da85d9' into froyo-plus-aosp

* commit '7e5e3745cf0103219a13071fbd488c3c01da85d9':
  Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
This commit is contained in:
Adam Powell
2010-05-24 16:23:53 -07:00
committed by Android Git Automerger
parent 3cffe1abab 7e5e3745cf
commit f67c874c07
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/widget/AbsListView.java
View File

@@ -2645,7 +2645,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
mScrollDuration); mScrollDuration);
mLastSeenPos = lastPos; mLastSeenPos = lastPos;
if (lastPos != mTargetPos) { if (lastPos < mTargetPos) {
post(this); post(this);
} }
break; break;
@@ -2671,7 +2671,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
final int nextViewHeight = nextView.getHeight(); final int nextViewHeight = nextView.getHeight();
final int nextViewTop = nextView.getTop(); final int nextViewTop = nextView.getTop();
final int extraScroll = mExtraScroll; final int extraScroll = mExtraScroll;
if (nextPos != mBoundPos) { if (nextPos < mBoundPos) {
smoothScrollBy(Math.max(0, nextViewHeight + nextViewTop - extraScroll), smoothScrollBy(Math.max(0, nextViewHeight + nextViewTop - extraScroll),
mScrollDuration); mScrollDuration);
@@ -2704,7 +2704,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
mLastSeenPos = firstPos; mLastSeenPos = firstPos;
if (firstPos != mTargetPos) { if (firstPos > mTargetPos) {
post(this); post(this);
} }
break; break;
@@ -2728,7 +2728,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
final int lastViewTop = lastView.getTop(); final int lastViewTop = lastView.getTop();
final int lastViewPixelsShowing = listHeight - lastViewTop; final int lastViewPixelsShowing = listHeight - lastViewTop;
mLastSeenPos = lastPos; mLastSeenPos = lastPos;
if (lastPos != mBoundPos) { if (lastPos > mBoundPos) {
smoothScrollBy(-(lastViewPixelsShowing - mExtraScroll), mScrollDuration); smoothScrollBy(-(lastViewPixelsShowing - mExtraScroll), mScrollDuration);
post(this); post(this);
} else { } else {