summaryrefslogtreecommitdiff
path: root/core/java/android/widget/GridView.java
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-07-13 19:00:01 -0700
committerAlan Viverette <alanv@google.com>2014-07-14 19:03:43 +0000
commit1dada3da99c4521920c74dcc70e7a042ea75b8d2 (patch)
treed32cd135c8d127c3feee01915950166de6755c27 /core/java/android/widget/GridView.java
parent8fbd0dc30328338cb7a6675ce7e0fe48a7815e1b (diff)
DO NOT MERGE Remove sub-position scroller
BUG: 14477472 Change-Id: I019c58dedb383e9e906831c8e44bab8b88e92604 (cherry picked from commit 66072fe0e1494a851e54bc7756734141dfbf4fe0)
Diffstat (limited to 'core/java/android/widget/GridView.java')
-rw-r--r--core/java/android/widget/GridView.java34
1 files changed, 0 insertions, 34 deletions
diff --git a/core/java/android/widget/GridView.java b/core/java/android/widget/GridView.java
index 93810b3f6bf3..33cc66e55bc2 100644
--- a/core/java/android/widget/GridView.java
+++ b/core/java/android/widget/GridView.java
@@ -1029,11 +1029,6 @@ public class GridView extends AbsListView {
}
@Override
- AbsPositionScroller createPositionScroller() {
- return new GridViewPositionScroller();
- }
-
- @Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
// Sets up mListPadding
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
@@ -2392,33 +2387,4 @@ public class GridView extends AbsListView {
column, 1, row, 1, isHeading, isSelected);
info.setCollectionItemInfo(itemInfo);
}
-
- /**
- * Sub-position scroller that understands the layout of a GridView.
- */
- class GridViewPositionScroller extends AbsSubPositionScroller {
- @Override
- public int getRowForPosition(int position) {
- return position / mNumColumns;
- }
-
- @Override
- public int getFirstPositionForRow(int row) {
- return row * mNumColumns;
- }
-
- @Override
- public int getHeightForRow(int row) {
- final int firstRowPosition = row * mNumColumns;
- final int lastRowPosition = Math.min(getCount(), firstRowPosition + mNumColumns);
- int maxHeight = 0;
- for (int i = firstRowPosition; i < lastRowPosition; i++) {
- final int height = getHeightForPosition(i);
- if (height > maxHeight) {
- maxHeight = height;
- }
- }
- return maxHeight;
- }
- }
}