commit ae4f155e090bf387b989fb738ee34ab045585711
author Adam Cohen <adamcohen@google.com> Thu Oct 20 00:15:42 2011 -0700
committer Adam Cohen <adamcohen@google.com> Thu Oct 20 00:18:52 2011 -0700
tree 851fc1a2850299bad1d5155fe911c1bd0bae73e2
parent d3357b186d55816e682b3012cfccd2d7a0680678

Fixing AllAppsCustomize Keyboard Accessibility / NPE (issue 5483485)

Change-Id: I841823e28bf419028afea2a57352c4ad45c7c4a0

src/com/android/launcher2/PagedView.java

diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index 8121d3b..7be19bf 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -270,6 +270,10 @@
         return getChildAt(index);
     }
 
+    protected int indexToPage(int index) {
+        return index;
+    }
+
     /**
      * Updates the scroll of the current page immediately to its final scroll position.  We use this
      * in CustomizePagedView to allow tabs to share the same PagedView while resetting the scroll of
@@ -714,7 +718,7 @@
 
     @Override
     public boolean requestChildRectangleOnScreen(View child, Rect rectangle, boolean immediate) {
-        int page = indexOfChild(child);
+        int page = indexToPage(indexOfChild(child));
         if (page != mCurrentPage || !mScroller.isFinished()) {
             snapToPage(page);
             return true;
@@ -1287,7 +1291,7 @@
     @Override
     public void requestChildFocus(View child, View focused) {
         super.requestChildFocus(child, focused);
-        int page = indexOfChild(child);
+        int page = indexToPage(indexOfChild(child));
         if (page >= 0 && page != getCurrentPage() && !isInTouchMode()) {
             snapToPage(page);
         }