diff options
author | Adam Cohen <adamcohen@google.com> | 2015-04-24 21:27:43 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-24 21:28:07 +0000 |
commit | d47d90224a6f723ea7b30a5767c9faccc02e63bd (patch) | |
tree | b1aa9aced4c5d81624435084796f10d3f799d41f | |
parent | f196394dee696752e9d5da32621caee374e52f8b (diff) | |
parent | ba17ad75f001d19b4ae43e9401a41b8d18f02a6e (diff) | |
download | android_packages_apps_Trebuchet-d47d90224a6f723ea7b30a5767c9faccc02e63bd.tar.gz android_packages_apps_Trebuchet-d47d90224a6f723ea7b30a5767c9faccc02e63bd.tar.bz2 android_packages_apps_Trebuchet-d47d90224a6f723ea7b30a5767c9faccc02e63bd.zip |
Merge "Add override method to fix building against master support lib." into ub-launcher3-burnaby
-rw-r--r-- | src/com/android/launcher3/AppsContainerRecyclerView.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/launcher3/AppsContainerRecyclerView.java b/src/com/android/launcher3/AppsContainerRecyclerView.java index 16244ee35..f8897128e 100644 --- a/src/com/android/launcher3/AppsContainerRecyclerView.java +++ b/src/com/android/launcher3/AppsContainerRecyclerView.java @@ -156,6 +156,10 @@ public class AppsContainerRecyclerView extends RecyclerView handleTouchEvent(ev); } + public void onRequestDisallowInterceptTouchEvent(boolean disallowIntercept) { + // Do nothing + } + /** * Handles the touch event and determines whether to show the fast scroller (or updates it if * it is already showing). |