Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Controls UI - Prevent parent scroll while using dragging control" into rvc-dev

Browse Source
This commit is contained in:
Matt Pietal
2020-03-26 23:06:13 +00:00
committed by Android (Google) Code Review
parent f77d4b3d3e 1cbf78de6a
commit 04dfb4263f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/controls/ui/ToggleRangeBehavior.kt
View File

@@ -64,12 +64,13 @@ class ToggleRangeBehavior : Behavior {
val gestureListener = ToggleRangeGestureListener(cvh.layout) val gestureListener = ToggleRangeGestureListener(cvh.layout)
val gestureDetector = GestureDetector(context, gestureListener) val gestureDetector = GestureDetector(context, gestureListener)
cvh.layout.setOnTouchListener { _: View, e: MotionEvent -> cvh.layout.setOnTouchListener { v: View, e: MotionEvent ->
if (gestureDetector.onTouchEvent(e)) { if (gestureDetector.onTouchEvent(e)) {
return@setOnTouchListener true return@setOnTouchListener true
} }
if (e.getAction() == MotionEvent.ACTION_UP && gestureListener.isDragging) { if (e.getAction() == MotionEvent.ACTION_UP && gestureListener.isDragging) {
v.getParent().requestDisallowInterceptTouchEvent(false)
gestureListener.isDragging = false gestureListener.isDragging = false
endUpdateRange() endUpdateRange()
return@setOnTouchListener true return@setOnTouchListener true
@@ -254,6 +255,7 @@ class ToggleRangeBehavior : Behavior {
yDiff: Float yDiff: Float
): Boolean { ): Boolean {
if (!isDragging) { if (!isDragging) {
v.getParent().requestDisallowInterceptTouchEvent(true)
this@ToggleRangeBehavior.beginUpdateRange() this@ToggleRangeBehavior.beginUpdateRange()
isDragging = true isDragging = true
} }