summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2015-05-07 18:22:35 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-07 18:22:35 +0000
commit4e267f4cdca3ec52aa55982560551ea766adf9be (patch)
tree86a0046c67e31c9daaeb0a5edc66dea88cbd1b28 /src/com/android
parent067e5e0177a4429e8833b2fd96725eb92e48ab8a (diff)
parent0a71b9d83fc425421d7e2105f429b01ae8fe3428 (diff)
downloadandroid_packages_apps_Trebuchet-4e267f4cdca3ec52aa55982560551ea766adf9be.tar.gz
android_packages_apps_Trebuchet-4e267f4cdca3ec52aa55982560551ea766adf9be.tar.bz2
android_packages_apps_Trebuchet-4e267f4cdca3ec52aa55982560551ea766adf9be.zip
Merge "Adding abstract methods for new RecyclerView lib." into ub-launcher3-burnaby
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/launcher3/AppsContainerRecyclerView.java4
-rw-r--r--src/com/android/launcher3/widget/WidgetsContainerRecyclerView.java4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/launcher3/AppsContainerRecyclerView.java b/src/com/android/launcher3/AppsContainerRecyclerView.java
index d91bceac9..7f64be2f5 100644
--- a/src/com/android/launcher3/AppsContainerRecyclerView.java
+++ b/src/com/android/launcher3/AppsContainerRecyclerView.java
@@ -187,6 +187,10 @@ public class AppsContainerRecyclerView extends RecyclerView
handleTouchEvent(ev);
}
+ public void onRequestDisallowInterceptTouchEvent(boolean disallowIntercept) {
+ // DO NOT REMOVE, NEEDED IMPLEMENTATION FOR M BUILDS
+ }
+
/**
* Handles the touch event and determines whether to show the fast scroller (or updates it if
* it is already showing).
diff --git a/src/com/android/launcher3/widget/WidgetsContainerRecyclerView.java b/src/com/android/launcher3/widget/WidgetsContainerRecyclerView.java
index 80e13bcf2..65694bfaa 100644
--- a/src/com/android/launcher3/widget/WidgetsContainerRecyclerView.java
+++ b/src/com/android/launcher3/widget/WidgetsContainerRecyclerView.java
@@ -87,4 +87,8 @@ public class WidgetsContainerRecyclerView extends RecyclerView
public void onTouchEvent(RecyclerView rv, MotionEvent ev) {
// Do nothing.
}
+
+ public void onRequestDisallowInterceptTouchEvent(boolean disallowIntercept) {
+ // DO NOT REMOVE, NEEDED IMPLEMENTATION FOR M BUILDS
+ }
} \ No newline at end of file