am 98e955d2: am 20d6caf8: Merge "Fix issue #13366. Take account of stackFromBottom in computeVerticalScrollOffset()."

* commit '98e955d295441636ba19688e18a8223691256d2c':
  Fix issue #13366. Take account of stackFromBottom in computeVerticalScrollOffset().

1 files changed, 6 insertions, 1 deletions

diff --git a/core/java/android/widget/GridView.java b/core/java/android/widget/GridView.java
index 71ad148591a1..f23e1aaaf47a 100644
--- a/core/java/android/widget/GridView.java
+++ b/core/java/android/widget/GridView.java
@@ -2217,8 +2217,13 @@ public class GridView extends AbsListView {
             int height = view.getHeight();
             if (height > 0) {
                 final int numColumns = mNumColumns;
-                final int whichRow = mFirstPosition / numColumns;
                 final int rowCount = (mItemCount + numColumns - 1) / numColumns;
+                // In case of stackFromBottom the calculation of whichRow needs
+                // to take into account that counting from the top the first row
+                // might not be entirely filled.
+                final int oddItemsOnFirstRow = isStackFromBottom() ? ((rowCount * numColumns) -
+                        mItemCount) : 0;
+                final int whichRow = (mFirstPosition + oddItemsOnFirstRow) / numColumns;
                 return Math.max(whichRow * 100 - (top * 100) / height +
                         (int) ((float) mScrollY / getHeight() * rowCount * 100), 0);
             }