diff options
| author | Joe Onorato <joeo@android.com> | 2009-12-09 15:56:47 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-09 15:56:47 -0800 |
| commit | 31f8c994a34dbff4573d32dcc49eec75e7bb546d (patch) | |
| tree | 2db06e6c4ed1cce679c4cb0235ea44b46e5fe0e6 | |
| parent | 53d0a74996bc2274e64c5582c63ae87beb9f5dde (diff) | |
| parent | 5a7970b536bfee8cb486f42c0ab70f1d6ea80fe9 (diff) | |
| download | packages_apps_trebuchet-31f8c994a34dbff4573d32dcc49eec75e7bb546d.zip packages_apps_trebuchet-31f8c994a34dbff4573d32dcc49eec75e7bb546d.tar.gz packages_apps_trebuchet-31f8c994a34dbff4573d32dcc49eec75e7bb546d.tar.bz2 | |
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
| -rw-r--r-- | src/com/android/launcher2/AllAppsView.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ public class AllAppsView extends RSSurfaceView } 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; |