Merge "Revert^2 "Don't draw QS if not visible"" into main (73e22921) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/composefragment/QSFragmentCompose.kt

+16 −1

Original line number	Diff line number	Diff line
		@@ -479,6 +479,7 @@ constructor(
		}

		override fun setQsVisible(qsVisible: Boolean) {
		containerView?.qsVisible = qsVisible
		viewModel.isQsVisible = qsVisible
		}

		@@ -1181,6 +1182,14 @@ private class FrameLayoutTouchPassthrough(
		}
		}

		var qsVisible: Boolean = false
		set(value) {
		if (value != field) {
		field = value
		invalidate()
		}
		}

		private var dirtyClipData = false

		private val clipEnabled
		@@ -1219,8 +1228,14 @@ private class FrameLayoutTouchPassthrough(
		canvas.clipOutPath(currentClippingPath)
		canvas.translate(0f, translationY)
		}
		if (qsVisible) {
		// If QS should not be visible, there's no need to draw this tree at all. We do this
		// in the view (instead of in compose) so it's completely synchronized with the clip.
		// As this FrameLayout doesn't have any content, and the ComposeView is the only child,
		// this is equivalent to blocking the draw in `drawChild`.
		super.dispatchDraw(canvas)
		}
		}

		override fun isTransformedTouchPointInView(
		x: Float,