aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 02:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignore generic motion events if custom content doesn't allow scrolling

Browse Source 
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
This commit is contained in:
Jan-Willem Maarse
2014-08-19 15:27:48 -07:00
parent 800a4f217a
commit d3fbe683bb
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/launcher3/Workspace.java
View File

@@ -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++) {