From 4ff7d79ddcee0a95fe6e7458731decd694b91d03 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Mon, 2 Apr 2012 03:46:50 -0700
Subject: Show side pages when exiting spring-loaded mode

Bug: 6132598
Change-Id: I2bf9025b7ac66d020522448b003905cb37c87587
---
 src/com/android/launcher2/PagedView.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/com/android/launcher2/PagedView.java')

diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index 5434704ea..8a2a5a0ac 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -721,20 +721,21 @@ public abstract class PagedView extends ViewGroup {
 
     protected void getVisiblePages(int[] range) {
         final int pageCount = getChildCount();
+
         if (pageCount > 0) {
             final int screenWidth = getMeasuredWidth();
             int leftScreen = 0;
             int rightScreen = 0;
             View currPage = getPageAt(leftScreen);
             while (leftScreen < pageCount - 1 &&
-                    currPage.getRight() - currPage.getPaddingRight() < mScrollX) {
+                    currPage.getX() + currPage.getWidth() - currPage.getPaddingRight() < mScrollX) {
                 leftScreen++;
                 currPage = getPageAt(leftScreen);
             }
             rightScreen = leftScreen;
             currPage = getPageAt(rightScreen + 1);
             while (rightScreen < pageCount - 1 &&
-                    currPage.getLeft() + currPage.getPaddingLeft() < mScrollX + screenWidth) {
+                    currPage.getX() - currPage.getPaddingLeft() < mScrollX + screenWidth) {
                 rightScreen++;
                 currPage = getPageAt(rightScreen + 1);
             }
-- 
cgit v1.2.3