Merge "Avoid using derivedStateOf for QS Y translation" into main (7b8519a3) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/composefragment/viewmodel/QSFragmentComposeViewModel.kt

+16 −16

Original line number	Diff line number	Diff line
		@@ -233,7 +233,8 @@ constructor(

		var overScrollAmount by mutableStateOf(0)

		val viewTranslationY by derivedStateOf {
		val viewTranslationY: Float
		get() =
		if (isOverscrolling) {
		overScrollAmount.toFloat()
		} else {
		@@ -243,11 +244,11 @@ constructor(
		headerTranslation
		}
		}
		}

		val qsScrollTranslationY by derivedStateOf {
		val qsScrollTranslationY: Float
		get() {
		val panelTranslationY = translationScaleY * heightDiff
		if (onKeyguardAndExpanded) panelTranslationY else 0f
		return if (onKeyguardAndExpanded) panelTranslationY else 0f
		}

		val viewAlpha by derivedStateOf {
		@@ -431,9 +432,8 @@ constructor(
		private val translationScaleY: Float
		get() = ((qsExpansion - 1) * (if (isInSplitShade) 1f else SHORT_PARALLAX_AMOUNT))

		private val headerTranslation by derivedStateOf {
		if (isTransitioningToFullShade) 0f else proposedTranslation
		}
		private val headerTranslation: Float
		get() = if (isTransitioningToFullShade) 0f else proposedTranslation

		private val alphaProgress by derivedStateOf {
		when {