Merge "[expressive design] Set App bar default collapsed." into main (01f77ce0) · Commits · e / os / android_frameworks_base

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/SettingsScaffold.kt

+5 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ import androidx.compose.ui.tooling.preview.Preview
		import com.android.settingslib.spa.framework.compose.horizontalValues
		import com.android.settingslib.spa.framework.compose.verticalValues
		import com.android.settingslib.spa.framework.theme.SettingsTheme
		import com.android.settingslib.spa.framework.theme.isSpaExpressiveEnabled
		import com.android.settingslib.spa.framework.theme.settingsBackground
		import com.android.settingslib.spa.widget.preference.Preference
		import com.android.settingslib.spa.widget.preference.PreferenceModel
		@@ -55,6 +56,10 @@ fun SettingsScaffold(
		) {
		ActivityTitle(title)
		val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior()
		if (isSpaExpressiveEnabled) {
		LaunchedEffect(scrollBehavior.state.heightOffsetLimit) { scrollBehavior.collapse() }
		}

		Scaffold(
		modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
		topBar = { SettingsTopAppBar(title, scrollBehavior, actions) },