Merge "Auto scroll to the top when dragging a tile in Edit mode" into main (3aa3c412) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -221,7 +221,7 @@ constructor(
		{ notificationScrimClippingParams.params.top },
		// Only allow scrolling when we are fully expanded. That way, we don't intercept
		// swipes in lockscreen (when somehow QS is receiving touches).
		{ scrollState.canScrollForward && viewModel.isQsFullyExpanded },
		{ (scrollState.canScrollForward && viewModel.isQsFullyExpanded) \|\| isCustomizing },
		)
		frame.addView(
		composeView,

+8 −5

Original line number	Diff line number	Diff line
		@@ -202,14 +202,17 @@ fun DefaultEditTileGrid(
		topBar = { EditModeTopBar(onStopEditing = onStopEditing, onReset = reset) },
		) { innerPadding ->
		CompositionLocalProvider(LocalOverscrollConfiguration provides null) {
		val scrollState = rememberScrollState()
		LaunchedEffect(listState.dragInProgress) {
		if (listState.dragInProgress) {
		scrollState.animateScrollTo(0)
		}
		}

		Column(
		verticalArrangement =
		spacedBy(dimensionResource(id = R.dimen.qs_label_container_margin)),
		modifier =
		modifier
		.fillMaxSize()
		.verticalScroll(rememberScrollState())
		.padding(innerPadding),
		modifier = modifier.fillMaxSize().verticalScroll(scrollState).padding(innerPadding),
		) {
		AnimatedContent(
		targetState = listState.dragInProgress,