Merge "Controls UI - Prevent parent scroll while using dragging control" into... (15bd2331) · Commits · e / os / android_frameworks_base

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -64,12 +64,13 @@ class ToggleRangeBehavior : Behavior {

		val gestureListener = ToggleRangeGestureListener(cvh.layout)
		val gestureDetector = GestureDetector(context, gestureListener)
		cvh.layout.setOnTouchListener { _: View, e: MotionEvent ->
		cvh.layout.setOnTouchListener { v: View, e: MotionEvent ->
		if (gestureDetector.onTouchEvent(e)) {
		return@setOnTouchListener true
		}

		if (e.getAction() == MotionEvent.ACTION_UP && gestureListener.isDragging) {
		v.getParent().requestDisallowInterceptTouchEvent(false)
		gestureListener.isDragging = false
		endUpdateRange()
		return@setOnTouchListener true
		@@ -254,6 +255,7 @@ class ToggleRangeBehavior : Behavior {
		yDiff: Float
		): Boolean {
		if (!isDragging) {
		v.getParent().requestDisallowInterceptTouchEvent(true)
		this@ToggleRangeBehavior.beginUpdateRange()
		isDragging = true
		}