Merge "Disable drag behavior until toggle is on" into rvc-dev am: 5cc6274e30

Change-Id: I9a2669cf864c436279a6c70eb965743be5cd1bf2
2020-04-14 16:15:53 +00:00
parent c544c189ed 5cc6274e30
commit 1cf702291d
1 changed files with 3 additions and 0 deletions
--- a/packages/SystemUI/src/com/android/systemui/controls/ui/ToggleRangeBehavior.kt
+++ b/packages/SystemUI/src/com/android/systemui/controls/ui/ToggleRangeBehavior.kt
@@ -256,6 +256,9 @@ class ToggleRangeBehavior : Behavior {
            xDiff: Float,
            yDiff: Float
        ): Boolean {
+            if (!template.isChecked) {
+                return false
+            }
            if (!isDragging) {
                v.getParent().requestDisallowInterceptTouchEvent(true)
                this@ToggleRangeBehavior.beginUpdateRange()