diff options
author | Conley Owens <cco3@android.com> | 2011-04-29 17:35:29 -0700 |
---|---|---|
committer | Conley Owens <cco3@android.com> | 2011-04-29 17:35:29 -0700 |
commit | dddaa56f793ad9ecb4e20df746f562ac7f24d158 (patch) | |
tree | 9928f59f2979598ace84cf1b250b447d45c58c9d /core/java | |
parent | f395e3042accd7f3f5df466dbb532befcd1db5d4 (diff) | |
parent | b737647db80dad073408064710d61b28890c6e98 (diff) | |
download | frameworks_base-dddaa56f793ad9ecb4e20df746f562ac7f24d158.zip frameworks_base-dddaa56f793ad9ecb4e20df746f562ac7f24d158.tar.gz frameworks_base-dddaa56f793ad9ecb4e20df746f562ac7f24d158.tar.bz2 |
Merge commit 'b737647d' (Scrolling using arrow keys with padding) into m
Conflicts:
core/java/android/widget/ScrollView.java
Change-Id: I1cfd3f7091e92793ce9fa048a09ae08a04c10c80
Diffstat (limited to 'core/java')
-rw-r--r-- | core/java/android/widget/ScrollView.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/java/android/widget/ScrollView.java b/core/java/android/widget/ScrollView.java index 4b4f5f2..ade3a0a 100644 --- a/core/java/android/widget/ScrollView.java +++ b/core/java/android/widget/ScrollView.java @@ -873,7 +873,7 @@ public class ScrollView extends FrameLayout { int count = getChildCount(); if (count > 0) { View view = getChildAt(count - 1); - mTempRect.bottom = view.getBottom(); + mTempRect.bottom = view.getBottom() + mPaddingBottom; mTempRect.top = mTempRect.bottom - height; } } @@ -949,9 +949,7 @@ public class ScrollView extends FrameLayout { } else if (direction == View.FOCUS_DOWN) { if (getChildCount() > 0) { int daBottom = getChildAt(0).getBottom(); - - int screenBottom = getScrollY() + getHeight(); - + int screenBottom = getScrollY() + getHeight() - mPaddingBottom; if (daBottom - screenBottom < maxJump) { scrollDelta = daBottom - screenBottom; } |