Merge "[Expressive design] Use fade effect for top app bars" into main (193a9f9f) · Commits · e / os / android_frameworks_base

packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v36/styles_expressive.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,8 @@
		<item name="scrimAnimationDuration">50</item>
		<item name="collapsedTitleTextColor">@color/settingslib_materialColorOnSurface</item>
		<item name="expandedTitleTextColor">@color/settingslib_materialColorOnSurface</item>
		<item name="titleCollapseMode">fade</item>
		<item name="extraMultilineHeightEnabled">true</item>
		</style>
		<style name="SettingsLibCollapsingToolbarLayoutStyle.Expressive">
		<item name="contentScrim">@color/settingslib_materialColorSurfaceContainer</item>

+6 −16

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ import androidx.compose.runtime.Composable
		import androidx.compose.runtime.remember
		import androidx.window.embedding.ActivityEmbeddingController
		import com.android.settingslib.spa.framework.compose.localActivity
		import com.android.settingslib.spa.framework.theme.isSpaExpressiveEnabled

		@OptIn(ExperimentalMaterial3Api::class)
		@Composable
		@@ -34,14 +33,6 @@ internal fun SettingsTopAppBar(
		isFirstLayerPageWhenEmbedded: Boolean,
		actions: @Composable RowScope.() -> Unit,
		) {
		if (isSpaExpressiveEnabled) {
		MorphingTitleLargeTopAppBar(
		title = title,
		navigationIcon = { NavigationIcon(isFirstLayerPageWhenEmbedded) },
		actions = actions,
		scrollBehavior = scrollBehavior,
		)
		} else {
		CustomizedLargeTopAppBar(
		title = title,
		navigationIcon = { NavigationIcon(isFirstLayerPageWhenEmbedded) },
		@@ -49,7 +40,6 @@ internal fun SettingsTopAppBar(
		scrollBehavior = scrollBehavior,
		)
		}
		}

		@Composable
		private fun NavigationIcon(isFirstLayerPageWhenEmbedded: Boolean) {