commit 75c7c5ae287e79e8502bc9e23853ff64def8e8bf
author Sunny Goyal <sunnygoyal@google.com> Wed Jan 27 16:55:50 2016 -0800
committer Sunny Goyal <sunnygoyal@google.com> Wed Jan 27 16:55:50 2016 -0800
tree 3439a89b0545deb78bb62ff63131dca249531d37
parent ccf3a9ed56a46b665a5aba6a5e0396ac07f79e68
parent 6362683acb884ec72fe10f1cf394d178d3918a96

resolve merge conflicts of 6362683acb to ub-launcher3-calgary.

Change-Id: Id48bf33912bf927121356a08b8501ee0070bfdc7

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index d4cacea..51c1dbd 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -28,6 +28,7 @@
 import android.graphics.Canvas;
 import android.graphics.Matrix;
 import android.graphics.Rect;
+import android.graphics.RectF;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Parcel;
@@ -131,8 +132,6 @@
 
     protected int mTouchSlop;
     private int mMaximumVelocity;
-    protected int mCellCountX = 0;
-    protected int mCellCountY = 0;
     protected boolean mAllowOverScroll = true;
     protected int[] mTempVisiblePagesRange = new int[2];
 
@@ -183,6 +182,7 @@
     private static final float[] sTmpPoint = new float[2];
     private static final int[] sTmpIntPoint = new int[2];
     private static final Rect sTmpRect = new Rect();
+    private static final RectF sTmpRectF = new RectF();
 
     protected final Rect mInsets = new Rect();
     protected final boolean mIsRtl;
@@ -1035,31 +1035,25 @@
 
     protected void getVisiblePages(int[] range) {
         final int pageCount = getChildCount();
-        sTmpIntPoint[0] = sTmpIntPoint[1] = 0;
-
         range[0] = -1;
         range[1] = -1;
 
         if (pageCount > 0) {
-            int viewportWidth = getViewportWidth();
             int lastVisiblePageIndex = 0;
+            final int visibleLeft = -getLeft();
+            final int visibleRight = visibleLeft + getViewportWidth();
 
             for (int currPageIndex = 0; currPageIndex < pageCount; currPageIndex++) {
                 View currPage = getPageAt(currPageIndex);
 
-                sTmpIntPoint[0] = 0;
-                Utilities.getDescendantCoordRelativeToParent(currPage, this, sTmpIntPoint, false);
-                if (sTmpIntPoint[0] > viewportWidth) {
-                    if (range[0] == -1) {
-                        continue;
-                    } else {
-                        break;
-                    }
-                }
+                // Verify if the page bounds are within the visible range.
+                sTmpRectF.left = 0;
+                sTmpRectF.right = currPage.getMeasuredWidth();
+                currPage.getMatrix().mapRect(sTmpRectF);
+                sTmpRectF.offset(currPage.getLeft() - getScrollX(), 0);
+                getMatrix().mapRect(sTmpRectF);
 
-                sTmpIntPoint[0] = currPage.getMeasuredWidth();
-                Utilities.getDescendantCoordRelativeToParent(currPage, this, sTmpIntPoint, false);
-                if (sTmpIntPoint[0] < 0) {
+                if (sTmpRectF.left > visibleRight || sTmpRectF.right < visibleLeft) {
                     if (range[0] == -1) {
                         continue;
                     } else {