summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Guy <romainguy@google.com>2010-08-20 11:40:42 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-08-20 11:40:42 -0700
commitd7d41417138c2b4b8904b9dd4d542eb031e01d28 (patch)
treedc67e5bfdf943ef3a82aa37006171cae31fad705
parent727f658e81acadd082d2a658ece2b0b45e62c0fc (diff)
parent64d50a67f44f6f8627b6d5203f0e3b26dc4f71e5 (diff)
downloadframeworks_base-d7d41417138c2b4b8904b9dd4d542eb031e01d28.zip
frameworks_base-d7d41417138c2b4b8904b9dd4d542eb031e01d28.tar.gz
frameworks_base-d7d41417138c2b4b8904b9dd4d542eb031e01d28.tar.bz2
Merge "GridView's pageScroll() would be offset by one item."
-rw-r--r--core/java/android/widget/GridView.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/widget/GridView.java b/core/java/android/widget/GridView.java
index ea767f6..f70051d 100644
--- a/core/java/android/widget/GridView.java
+++ b/core/java/android/widget/GridView.java
@@ -1551,9 +1551,9 @@ public class GridView extends AbsListView {
int nextPage = -1;
if (direction == FOCUS_UP) {
- nextPage = Math.max(0, mSelectedPosition - getChildCount() - 1);
+ nextPage = Math.max(0, mSelectedPosition - getChildCount());
} else if (direction == FOCUS_DOWN) {
- nextPage = Math.min(mItemCount - 1, mSelectedPosition + getChildCount() - 1);
+ nextPage = Math.min(mItemCount - 1, mSelectedPosition + getChildCount());
}
if (nextPage >= 0) {