Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06dcc2ec authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

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

Merge "Controls UI - Prevent parent scroll while using dragging control" into rvc-dev am: 04dfb426

Change-Id: I7969a48c34f96e482b73fc81cf4af56c30f8518d
parents 8569d185 04dfb426

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

            }