am 5a7970b5: am af5b4cb2: Fix 2305903 Scrolling trackball upwards at the top of the app menu selects app at the bottom left
Merge commit '5a7970b536bfee8cb486f42c0ab70f1d6ea80fe9' into eclair-mr2-plus-aosp
* commit '5a7970b536bfee8cb486f42c0ab70f1d6ea80fe9':
Fix 2305903 Scrolling trackball upwards at the top of the app menu selects app at the bottom left
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;