commit 1f7b4296b1323c8b28f785e4eaae7a4025559916
author Joe Onorato <joeo@android.com> Thu Dec 10 13:32:36 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Dec 10 13:32:36 2009 -0800
tree 50acbbfd6342512cad020faae178023ab90c1bb7
parent 3ad4357ebda624a818114d529646740d246f0d7b
parent 31f8c994a34dbff4573d32dcc49eec75e7bb546d

am 31f8c994: am 5a7970b5: am af5b4cb2: Fix 2305903 Scrolling trackball upwards at the top of the app menu selects app at the bottom left

Merge commit '31f8c994a34dbff4573d32dcc49eec75e7bb546d'

* commit '31f8c994a34dbff4573d32dcc49eec75e7bb546d':
  Fix 2305903 Scrolling trackball upwards at the top of the app menu selects app at the bottom left

src/com/android/launcher2/AllAppsView.java

diff --git a/src/com/android/launcher2/AllAppsView.java b/src/com/android/launcher2/AllAppsView.java
index 9e22231..0c45075 100644
--- a/src/com/android/launcher2/AllAppsView.java
+++ b/src/com/android/launcher2/AllAppsView.java
@@ -368,8 +368,8 @@
                     } else if (currentTopRow > 0) {
                         newSelection = currentSelection - Defines.COLUMNS_PER_PAGE;
                         mRollo.moveTo(newSelection / Defines.COLUMNS_PER_PAGE);
-                    } else {
-                        newSelection = Defines.COLUMNS_PER_PAGE * (Defines.ROWS_PER_PAGE-1);
+                    } else if (currentPageRow != 0) {
+                        newSelection = currentTopRow * Defines.ROWS_PER_PAGE;
                     }
                 }
                 handled = true;