diff options
| author | Michael Jurka <mikejurka@google.com> | 2010-10-18 18:10:22 -0700 |
|---|---|---|
| committer | Michael Jurka <mikejurka@google.com> | 2010-10-18 18:16:46 -0700 |
| commit | 1adf5391a3a3d215b226adf3702019c22a99e3b1 (patch) | |
| tree | d624f0002317ad02a6b53bb828fd3fe73b91965f | |
| parent | ec031f50810fd16cb6243fbbbabd9ac76820c72b (diff) | |
| download | android_packages_apps_Trebuchet-1adf5391a3a3d215b226adf3702019c22a99e3b1.tar.gz android_packages_apps_Trebuchet-1adf5391a3a3d215b226adf3702019c22a99e3b1.tar.bz2 android_packages_apps_Trebuchet-1adf5391a3a3d215b226adf3702019c22a99e3b1.zip | |
Fixing a bug where you could scroll the mini screens
Change-Id: I3638618cb5f4ec2705955fda994fd6aff42fd70f
| -rw-r--r-- | src/com/android/launcher2/PagedView.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java index 11261a575..abb9b0be5 100644 --- a/src/com/android/launcher2/PagedView.java +++ b/src/com/android/launcher2/PagedView.java @@ -715,7 +715,7 @@ public abstract class PagedView extends ViewGroup { * Determines if we should change the touch state to start scrolling after the * user moves their touch point too far. */ - private void determineScrollingStart(MotionEvent ev) { + protected void determineScrollingStart(MotionEvent ev) { /* * Locally do absolute value. mLastMotionX is set to the y value * of the down event. diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 051ac65f8..8f5a11551 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -416,6 +416,11 @@ public class Workspace extends SmoothPagedView return super.onInterceptTouchEvent(ev); } + @Override + protected void determineScrollingStart(MotionEvent ev) { + if (!mIsSmall && !mIsInUnshrinkAnimation) super.determineScrollingStart(ev); + } + protected void onPageBeginMoving() { if (mNextPage != INVALID_PAGE) { // we're snapping to a particular screen |