diff options
author | Jason Sams <rjsams@android.com> | 2009-10-20 18:19:55 -0700 |
---|---|---|
committer | Jason Sams <rjsams@android.com> | 2009-10-20 18:19:55 -0700 |
commit | 2e19c05891c9c7abd2200b8f9ade875a3ca02aa6 (patch) | |
tree | 6591c74c1f35f855e6cf5080675a37150f87ed3d /src/com/android/launcher2/AllAppsView.java | |
parent | 96b49d860cbb54daf83721ec67d292140e6753c9 (diff) | |
download | android_packages_apps_Trebuchet-2e19c05891c9c7abd2200b8f9ade875a3ca02aa6.tar.gz android_packages_apps_Trebuchet-2e19c05891c9c7abd2200b8f9ade875a3ca02aa6.tar.bz2 android_packages_apps_Trebuchet-2e19c05891c9c7abd2200b8f9ade875a3ca02aa6.zip |
Return friction table, tweak values for line rather than pages.
Diffstat (limited to 'src/com/android/launcher2/AllAppsView.java')
-rw-r--r-- | src/com/android/launcher2/AllAppsView.java | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/com/android/launcher2/AllAppsView.java b/src/com/android/launcher2/AllAppsView.java index 9c73a01be..d842f2d95 100644 --- a/src/com/android/launcher2/AllAppsView.java +++ b/src/com/android/launcher2/AllAppsView.java @@ -88,12 +88,12 @@ public class AllAppsView extends RSSurfaceView private RenderScript mRS; private RolloRS mRollo; private ArrayList<ApplicationInfo> mAllAppsList; - + /** * True when we are using arrow keys or trackball to drive navigation */ private boolean mArrowNavigation = false; - + private int mPageCount; private boolean mStartedScrolling; private VelocityTracker mVelocity; @@ -181,7 +181,7 @@ public class AllAppsView extends RSSurfaceView long endTime = SystemClock.uptimeMillis(); Log.d(TAG, "surfaceChanged took " + (endTime-startTime) + "ms"); } - + @Override protected void onFocusChanged(boolean gainFocus, int direction, Rect previouslyFocusedRect) { @@ -205,7 +205,7 @@ public class AllAppsView extends RSSurfaceView @Override public boolean onKeyDown(int keyCode, KeyEvent event) { - + if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER || keyCode == KeyEvent.KEYCODE_ENTER) { if (mArrowNavigation) { int whichApp = mRollo.mState.selectedIconIndex; @@ -215,20 +215,20 @@ public class AllAppsView extends RSSurfaceView } } } - + if (mArrowNavigation && mRollo.mState.iconCount > 0) { mArrowNavigation = true; - + int currentSelection = mRollo.mState.selectedIconIndex; int currentTopRow = (int) mRollo.mMessageProc.mPosX; - + // The column of the current selection, in the range 0..COLUMNS_PER_PAGE-1 int currentPageCol = currentSelection % Defines.COLUMNS_PER_PAGE; - + // The row of the current selection, in the range 0..ROWS_PER_PAGE-1 int currentPageRow = (currentSelection - (currentTopRow * Defines.COLUMNS_PER_PAGE)) / Defines.ROWS_PER_PAGE; - + int newSelection = currentSelection; switch (keyCode) { @@ -237,7 +237,7 @@ public class AllAppsView extends RSSurfaceView newSelection = currentSelection - Defines.COLUMNS_PER_PAGE; } else if (currentTopRow > 0) { mRollo.moveTo(currentTopRow - 1); - newSelection = currentSelection - Defines.COLUMNS_PER_PAGE; + newSelection = currentSelection - Defines.COLUMNS_PER_PAGE; } break; case KeyEvent.KEYCODE_DPAD_DOWN: @@ -256,7 +256,7 @@ public class AllAppsView extends RSSurfaceView } break; case KeyEvent.KEYCODE_DPAD_RIGHT: - if ((currentPageCol < Defines.COLUMNS_PER_PAGE - 1) && + if ((currentPageCol < Defines.COLUMNS_PER_PAGE - 1) && (currentSelection < mRollo.mState.iconCount - 1)) { newSelection = currentSelection + 1; } @@ -276,7 +276,7 @@ public class AllAppsView extends RSSurfaceView public boolean onTouchEvent(MotionEvent ev) { mArrowNavigation = false; - + if (!isVisible()) { return true; } @@ -635,8 +635,8 @@ public class AllAppsView extends RSSurfaceView private boolean checkClickOK() { //android.util.Log.e("rs", "check click " + Float.toString(mReadback.velocity) + ", " + Float.toString(mReadback.posX)); - return (Math.abs(mMessageProc.mVelocity) < 0.1f) && - (Math.abs(mMessageProc.mPosX - Math.round(mMessageProc.mPosX)) < 0.1f); + return (Math.abs(mMessageProc.mVelocity) < 0.4f) && + (Math.abs(mMessageProc.mPosX - Math.round(mMessageProc.mPosX)) < 0.4f); } class Params extends BaseAlloc { |