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

Merge "Ignore generic motion events if custom content doesn't allow scrolling" into ub-now-porkchop

Browse Source
This commit is contained in:
Jan-Willem Maarse
2014-08-20 20:03:58 +00:00
committed by Android (Google) Code Review
parent c50438c802 d3fbe683bb
commit 2111606845
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

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