Skip to content

Commit d70a362

Browse files
committed
Merge branch 'hotfix/5.0.2'
2 parents f48a51b + dc6af54 commit d70a362

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ apply plugin: 'kotlin-kapt'
66
apply from: '../versioning.gradle'
77

88
ext {
9-
VERSION_NAME = "5.0.1"
9+
VERSION_NAME = "5.0.2"
1010
USE_ORCHESTRATOR = project.hasProperty('orchestrator') ? project.property('orchestrator') : false
1111
}
1212

@@ -54,7 +54,7 @@ android {
5454
testOptions {
5555
unitTests.returnDefaultValues = true
5656

57-
if(USE_ORCHESTRATOR) {
57+
if (USE_ORCHESTRATOR) {
5858
execution 'ANDROID_TEST_ORCHESTRATOR'
5959
}
6060
}

app/src/main/java/com/duckduckgo/app/browser/DuckDuckGoWebView.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,10 @@ class DuckDuckGoWebView : WebView, NestedScrollingChild {
100100
MotionEvent.ACTION_DOWN -> {
101101
returnValue = super.onTouchEvent(event)
102102
lastY = eventY
103-
104103
startNestedScroll(ViewCompat.SCROLL_AXIS_VERTICAL)
105104
}
106105

107-
MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
106+
else -> {
108107
returnValue = super.onTouchEvent(event)
109108
stopNestedScroll()
110109
}

0 commit comments

Comments
 (0)