diff options
| author | Adam Powell <adamp@google.com> | 2010-05-24 16:30:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-24 16:30:16 -0700 |
| commit | e46c1e817c4e801b309af9644b9c20a188147303 (patch) | |
| tree | 594075c9ee498a771bcd20168e83577b8e4aed0a /core/java/android/widget | |
| parent | 2b4140ef1b68a074611bfd33ac9d2ec2c2a1064a (diff) | |
| parent | 49551ca41e5bdd15bce9908860a8dcf683da5b21 (diff) | |
| download | frameworks_base-e46c1e817c4e801b309af9644b9c20a188147303.zip frameworks_base-e46c1e817c4e801b309af9644b9c20a188147303.tar.gz frameworks_base-e46c1e817c4e801b309af9644b9c20a188147303.tar.bz2 | |
am 49551ca4: am 9a559970: am f67c874c: am 7e5e3745: Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/AbsListView.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index 78bbbce..c11c7e1 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -2665,7 +2665,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te mScrollDuration); mLastSeenPos = lastPos; - if (lastPos != mTargetPos) { + if (lastPos < mTargetPos) { post(this); } break; @@ -2691,7 +2691,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te final int nextViewHeight = nextView.getHeight(); final int nextViewTop = nextView.getTop(); final int extraScroll = mExtraScroll; - if (nextPos != mBoundPos) { + if (nextPos < mBoundPos) { smoothScrollBy(Math.max(0, nextViewHeight + nextViewTop - extraScroll), mScrollDuration); @@ -2724,7 +2724,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te mLastSeenPos = firstPos; - if (firstPos != mTargetPos) { + if (firstPos > mTargetPos) { post(this); } break; @@ -2748,7 +2748,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te final int lastViewTop = lastView.getTop(); final int lastViewPixelsShowing = listHeight - lastViewTop; mLastSeenPos = lastPos; - if (lastPos != mBoundPos) { + if (lastPos > mBoundPos) { smoothScrollBy(-(lastViewPixelsShowing - mExtraScroll), mScrollDuration); post(this); } else { |