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

Commit 66aedad6 authored by Anton Potapov's avatar Anton Potapov Committed by Android (Google) Code Review
Browse files

Merge "Add isSliceViewClickable before processing onClick in SliceView" into main

parents e11d5f30 d96d8541
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -98,10 +98,10 @@ private class ClickableSliceView(
    }

    override fun onInterceptTouchEvent(ev: MotionEvent?): Boolean {
        return onClick != null || super.onInterceptTouchEvent(ev)
        return (isSliceViewClickable && onClick != null) || super.onInterceptTouchEvent(ev)
    }

    override fun onClick(v: View?) {
        onClick?.let { it() } ?: super.onClick(v)
        onClick?.takeIf { isSliceViewClickable }?.let { it() } ?: super.onClick(v)
    }
}