diff options
author | Joe Onorato <joeo@android.com> | 2009-10-28 16:30:34 -0400 |
---|---|---|
committer | Joe Onorato <joeo@android.com> | 2009-10-28 16:30:34 -0400 |
commit | 664457dbfd1b82abdcc30c574e4cda586aa6a323 (patch) | |
tree | 0bd705dcf0e86544115d8197cda90cccea9a465a /src/com/android/launcher2/AllAppsView.java | |
parent | b39e51aee4c044059dd97c20f0c78f982ed9e388 (diff) | |
download | android_packages_apps_Trebuchet-664457dbfd1b82abdcc30c574e4cda586aa6a323.tar.gz android_packages_apps_Trebuchet-664457dbfd1b82abdcc30c574e4cda586aa6a323.tar.bz2 android_packages_apps_Trebuchet-664457dbfd1b82abdcc30c574e4cda586aa6a323.zip |
Fix 2200739 - Crash when you click on an empty icon slot in 3d all apps
Diffstat (limited to 'src/com/android/launcher2/AllAppsView.java')
-rw-r--r-- | src/com/android/launcher2/AllAppsView.java | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/src/com/android/launcher2/AllAppsView.java b/src/com/android/launcher2/AllAppsView.java index 783be9315..795f49067 100644 --- a/src/com/android/launcher2/AllAppsView.java +++ b/src/com/android/launcher2/AllAppsView.java @@ -1028,6 +1028,20 @@ public class AllAppsView extends RSSurfaceView mTouchXBorders[4] = width; } + void fling() { + mInvokeFling.execute(); + } + + void move() { + mInvokeMove.execute(); + } + + void moveTo(float row) { + mState.targetPos = row; + mState.save(); + mInvokeMoveTo.execute(); + } + int chooseTappedIcon(int x, int y, float pos) { // Adjust for scroll position if not zero. y += (pos - ((int)pos)) * (mTouchYBorders[1] - mTouchYBorders[0]); @@ -1051,22 +1065,14 @@ public class AllAppsView extends RSSurfaceView return -1; } - return (((int)pos) * Defines.COLUMNS_PER_PAGE) + int index = (((int)pos) * Defines.COLUMNS_PER_PAGE) + (row * Defines.ROWS_PER_PAGE) + col; - } - void fling() { - mInvokeFling.execute(); - } - - void move() { - mInvokeMove.execute(); - } - - void moveTo(float row) { - mState.targetPos = row; - mState.save(); - mInvokeMoveTo.execute(); + if (index >= mState.iconCount) { + return -1; + } else { + return index; + } } /** |