From 99f909546cfec304e54676bef65e997c3f749661 Mon Sep 17 00:00:00 2001 From: Tobias Rohloff Date: Thu, 7 Apr 2016 11:04:42 +0200 Subject: [PATCH] Fix #4, better multitouch support. --- gradle/wrapper/gradle-wrapper.properties | 2 +- lib/build.gradle | 8 ++++---- .../java/com/tobiasrohloff/view/NestedScrollWebView.java | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f23df6e..330e95a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip diff --git a/lib/build.gradle b/lib/build.gradle index 9dc2b69..6b1753f 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -2,13 +2,13 @@ apply plugin: 'com.android.library' android { compileSdkVersion 23 - buildToolsVersion "23.0.2" + buildToolsVersion "23.0.3" defaultConfig { minSdkVersion 7 targetSdkVersion 23 - versionCode 1 - versionName "1.0" + versionCode 3 + versionName "1.0.2" } buildTypes { release { @@ -19,5 +19,5 @@ android { } dependencies { - compile 'com.android.support:support-v4:23.1.1' + compile 'com.android.support:support-v4:23.2.1' } diff --git a/lib/src/main/java/com/tobiasrohloff/view/NestedScrollWebView.java b/lib/src/main/java/com/tobiasrohloff/view/NestedScrollWebView.java index 6b40346..1a34845 100644 --- a/lib/src/main/java/com/tobiasrohloff/view/NestedScrollWebView.java +++ b/lib/src/main/java/com/tobiasrohloff/view/NestedScrollWebView.java @@ -104,6 +104,7 @@ public boolean onTouchEvent(MotionEvent event) { trackedEvent.recycle(); result = super.onTouchEvent(trackedEvent); break; + case MotionEvent.ACTION_POINTER_DOWN: case MotionEvent.ACTION_UP: case MotionEvent.ACTION_CANCEL: stopNestedScroll();