Merge "[Spa] Make GlifScaffold Expressive" into main (41a06c25) · Commits · e / os / android_frameworks_base

packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/GallerySpaEnvironment.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ import com.android.settingslib.spa.gallery.preference.TwoTargetSwitchPreferenceP
		import com.android.settingslib.spa.gallery.preference.ZeroStatePreferencePageProvider
		import com.android.settingslib.spa.gallery.scaffold.PagerMainPageProvider
		import com.android.settingslib.spa.gallery.scaffold.SearchScaffoldPageProvider
		import com.android.settingslib.spa.gallery.scaffold.SuwScaffoldPageProvider
		import com.android.settingslib.spa.gallery.scaffold.GlifScaffoldPageProvider
		import com.android.settingslib.spa.gallery.ui.CategoryPageProvider
		import com.android.settingslib.spa.gallery.ui.CopyablePageProvider
		import com.android.settingslib.spa.gallery.scaffold.ScrollablePagerPageProvider
		@@ -103,7 +103,7 @@ class GallerySpaEnvironment(context: Context) : SpaEnvironment(context) {
		SettingsDropdownCheckBoxProvider,
		SettingsTextFieldPasswordPageProvider,
		SearchScaffoldPageProvider,
		SuwScaffoldPageProvider,
		GlifScaffoldPageProvider,
		BannerPageProvider,
		CopyablePageProvider,
		IntroPreferencePageProvider,

packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/home/HomePageProvider.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ import com.android.settingslib.spa.gallery.page.SliderPageProvider
		import com.android.settingslib.spa.gallery.preference.PreferenceMainPageProvider
		import com.android.settingslib.spa.gallery.scaffold.PagerMainPageProvider
		import com.android.settingslib.spa.gallery.scaffold.SearchScaffoldPageProvider
		import com.android.settingslib.spa.gallery.scaffold.SuwScaffoldPageProvider
		import com.android.settingslib.spa.gallery.scaffold.GlifScaffoldPageProvider
		import com.android.settingslib.spa.gallery.ui.CategoryPageProvider
		import com.android.settingslib.spa.gallery.ui.CopyablePageProvider
		import com.android.settingslib.spa.gallery.ui.SpinnerPageProvider
		@@ -64,7 +64,7 @@ object HomePageProvider : SettingsPageProvider {
		}
		Category {
		SearchScaffoldPageProvider.Entry()
		SuwScaffoldPageProvider.Entry()
		GlifScaffoldPageProvider.Entry()
		ArgumentPageProvider.EntryItem(stringParam = "foo", intParam = 0)
		}
		Category {

packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/scaffold/SuwScaffoldPageProvider.kt→packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/scaffold/GlifScaffoldPageProvider.kt

+19 −14

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 The Android Open Source Project
		* Copyright (C) 2025 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -37,22 +37,24 @@ import com.android.settingslib.spa.widget.illustration.ResourceType
		import com.android.settingslib.spa.widget.preference.Preference
		import com.android.settingslib.spa.widget.preference.PreferenceModel
		import com.android.settingslib.spa.widget.scaffold.BottomAppBarButton
		import com.android.settingslib.spa.widget.scaffold.SuwScaffold
		import com.android.settingslib.spa.widget.scaffold.GlifScaffold
		import com.android.settingslib.spa.widget.ui.SettingsBody
		import com.android.settingslib.spa.widget.ui.Spinner
		import com.android.settingslib.spa.widget.ui.SpinnerOption

		private const val TITLE = "Sample SuwScaffold"
		private const val TITLE = "Sample GlifScaffold"

		object SuwScaffoldPageProvider : SettingsPageProvider {
		override val name = "SuwScaffold"
		object GlifScaffoldPageProvider : SettingsPageProvider {
		override val name = "GlifScaffold"

		@Composable
		fun Entry() {
		Preference(object : PreferenceModel {
		Preference(
		object : PreferenceModel {
		override val title = TITLE
		override val onClick = navigator(name)
		})
		}
		)
		}

		@Composable
		@@ -63,9 +65,10 @@ object SuwScaffoldPageProvider : SettingsPageProvider {

		@Composable
		private fun Page() {
		SuwScaffold(
		GlifScaffold(
		imageVector = Icons.Outlined.SignalCellularAlt,
		title = "Connect to mobile network",
		description = "Select a mobile network to connect to",
		actionButton = BottomAppBarButton("Next") {},
		dismissButton = BottomAppBarButton("Cancel") {},
		) {
		@@ -78,9 +81,11 @@ private fun Page() {
		Column(Modifier.padding(SettingsDimension.itemPadding)) {
		SettingsBody("To add another SIM, download a new eSIM.")
		}
		Illustration(object : IllustrationModel {
		Illustration(
		object : IllustrationModel {
		override val resId = R.drawable.accessibility_captioning_banner
		override val resourceType = ResourceType.IMAGE
		})
		}
		)
		}
		}

packages/SettingsLib/Spa/screenshot/assets/phone/light_landscape_glifScaffold.png

0 → 100644

+105 KiB

Loading image diff...

packages/SettingsLib/Spa/screenshot/assets/phone/light_portrait_glifScaffold.png

0 → 100644

+105 KiB

Loading image diff...