Merge "Reset QS scroll manually when always composed" into main (f27d0773) · Commits · e / os / android_frameworks_base

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

+15 −3

Original line number	Diff line number	Diff line
		@@ -729,10 +729,22 @@ constructor(
		) {
		if (viewModel.isQsEnabled) {
		Element(ElementKeys.QuickSettingsContent, modifier = Modifier.weight(1f)) {
		if (alwaysCompose) {
		// scrollState never changes
		LaunchedEffect(Unit) {
		snapshotFlow { viewModel.isQsFullyCollapsed }
		.collect { collapsed ->
		if (collapsed) {
		scrollState.scrollTo(0)
		}
		}
		}
		} else {
		DisposableEffect(Unit) {
		lifecycleScope.launch { scrollState.scrollTo(0) }
		onDispose { lifecycleScope.launch { scrollState.scrollTo(0) } }
		}
		}
		Column(
		modifier =
		Modifier.fillMaxSize()