Merge "STL remove NestedScrollToScene 1/2" into main (0d84ee07) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt

+0 −1

Original line number	Diff line number	Diff line
		@@ -201,7 +201,6 @@ fun CommunalContainer(
		colors = colors,
		content = content,
		viewModel = viewModel,
		modifier = Modifier.horizontalNestedScrollToScene(),
		)
		}
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,6 @@ constructor(
		colors = communalColors,
		content = communalContent,
		viewModel = contentViewModel,
		modifier = modifier.horizontalNestedScrollToScene(),
		)
		}
		}

+2 −10

Original line number	Diff line number	Diff line
		@@ -88,7 +88,6 @@ import com.android.compose.animation.scene.ContentKey
		import com.android.compose.animation.scene.ContentScope
		import com.android.compose.animation.scene.ElementKey
		import com.android.compose.animation.scene.LowestZIndexContentPicker
		import com.android.compose.animation.scene.NestedScrollBehavior
		import com.android.compose.animation.scene.SceneTransitionLayoutState
		import com.android.compose.animation.scene.content.state.TransitionState
		import com.android.compose.modifiers.thenIf
		@@ -236,10 +235,7 @@ fun ContentScope.SnoozeableHeadsUpNotificationSpace(
		)
		}
		.thenIf(isHeadsUp) {
		Modifier.verticalNestedScrollToScene(
		bottomBehavior = NestedScrollBehavior.EdgeAlways
		)
		.nestedScroll(nestedScrollConnection)
		Modifier.nestedScroll(nestedScrollConnection)
		.scrollable(orientation = Orientation.Vertical, state = scrollableState)
		},
		)
		@@ -571,11 +567,7 @@ fun ContentScope.NotificationScrollingStack(
		) {
		Column(
		modifier =
		Modifier.verticalNestedScrollToScene(
		topBehavior = NestedScrollBehavior.EdgeWithPreview,
		isExternalOverscrollGesture = { isCurrentGestureOverscroll.value },
		)
		.thenIf(supportNestedScrolling) {
		Modifier.thenIf(supportNestedScrolling) {
		Modifier.nestedScroll(scrimNestedScrollConnection)
		}
		.stackVerticalOverscroll(coroutineScope) { scrollState.canScrollForward }

+1 −3

Original line number	Diff line number	Diff line
		@@ -202,9 +202,7 @@ fun SceneScope.QuickSettingsLayout(
		)
		Box(
		modifier =
		Modifier.requiredHeightIn(max = GridMaxHeight)
		.verticalNestedScrollToScene()
		.verticalScroll(rememberScrollState())
		Modifier.requiredHeightIn(max = GridMaxHeight).verticalScroll(rememberScrollState())
		) {
		GridAnchor()
		TileGrid(viewModel = viewModel.tileGridViewModel, modifier = Modifier.fillMaxWidth())

+0 −5

Original line number	Diff line number	Diff line
		@@ -65,7 +65,6 @@ import androidx.compose.ui.zIndex
		import androidx.lifecycle.compose.collectAsStateWithLifecycle
		import com.android.compose.animation.scene.ElementKey
		import com.android.compose.animation.scene.LowestZIndexContentPicker
		import com.android.compose.animation.scene.NestedScrollBehavior
		import com.android.compose.animation.scene.SceneScope
		import com.android.compose.animation.scene.UserAction
		import com.android.compose.animation.scene.UserActionResult
		@@ -400,10 +399,6 @@ private fun SceneScope.SingleShade(
		.height(navBarHeight)
		// Intercepts touches, prevents the scrollable container behind from scrolling.
		.clickable(interactionSource = null, indication = null) { /* do nothing */ }
		.verticalNestedScrollToScene(
		topBehavior = NestedScrollBehavior.EdgeAlways,
		isExternalOverscrollGesture = { false },
		)
		) {
		NotificationStackCutoffGuideline(
		stackScrollView = notificationStackScrollView,