diff options
author | Jan-Willem Maarse <maarse@google.com> | 2014-08-19 15:27:48 -0700 |
---|---|---|
committer | Jan-Willem Maarse <maarse@google.com> | 2014-08-19 15:27:48 -0700 |
commit | d3fbe683bb52c8be9a14783bb70f32a46cf6f6db (patch) | |
tree | cc7bd57a53bee26e7749e8a3b4df0c8d0b488918 /src/com | |
parent | 800a4f217a5b0b7817a70a24974fc13d6b7e4591 (diff) | |
download | android_packages_apps_Trebuchet-d3fbe683bb52c8be9a14783bb70f32a46cf6f6db.tar.gz android_packages_apps_Trebuchet-d3fbe683bb52c8be9a14783bb70f32a46cf6f6db.tar.bz2 android_packages_apps_Trebuchet-d3fbe683bb52c8be9a14783bb70f32a46cf6f6db.zip |
Ignore generic motion events if custom content doesn't allow scrolling
If the custom content screen is selected and it doesn't
allow scrolling, the workspace should ignore generic motion
events instead of trying to scroll to the next page.
Change-Id: Iee9c7e02bf7c78648b574a01c83dcb76c0b62855
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 53a3f948d..7adb46db4 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -1114,6 +1114,17 @@ public class Workspace extends SmoothPagedView return super.onInterceptTouchEvent(ev); } + @Override + public boolean onGenericMotionEvent(MotionEvent event) { + // Ignore pointer scroll events if the custom content doesn't allow scrolling. + if ((getScreenIdForPageIndex(getCurrentPage()) == CUSTOM_CONTENT_SCREEN_ID) + && (mCustomContentCallbacks != null) + && !mCustomContentCallbacks.isScrollingAllowed()) { + return false; + } + return super.onGenericMotionEvent(event); + } + protected void reinflateWidgetsIfNecessary() { final int clCount = getChildCount(); for (int i = 0; i < clCount; i++) { |