Merge changes from topic "WorkProfilePager" (c4c8920a) · Commits · e / os / android_frameworks_base

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,7 @@ private fun HomePage() {
		ArgumentPageProvider.EntryItem(stringParam = "foo", intParam = 0)

		SliderPageProvider.EntryItem()
		SettingsPagerPageProvider.EntryItem()
		FooterPageProvider.EntryItem()
		}
		}

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ val galleryPageRepository = SettingsPageRepository(
		SwitchPreferencePageProvider,
		ArgumentPageProvider,
		SliderPageProvider,
		SettingsPagerPageProvider,
		FooterPageProvider,
		),
		startDestination = Destinations.Home,

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

0 → 100644

+66 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settingslib.spa.gallery.page

		import android.os.Bundle
		import androidx.compose.foundation.layout.Box
		import androidx.compose.foundation.layout.fillMaxSize
		import androidx.compose.runtime.Composable
		import androidx.compose.ui.Alignment
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.tooling.preview.Preview
		import com.android.settingslib.spa.framework.api.SettingsPageProvider
		import com.android.settingslib.spa.framework.compose.navigator
		import com.android.settingslib.spa.framework.theme.SettingsTheme
		import com.android.settingslib.spa.widget.preference.Preference
		import com.android.settingslib.spa.widget.preference.PreferenceModel
		import com.android.settingslib.spa.widget.scaffold.SettingsPager
		import com.android.settingslib.spa.widget.ui.SettingsTitle

		object SettingsPagerPageProvider : SettingsPageProvider {
		override val name = "SettingsPager"

		@Composable
		override fun Page(arguments: Bundle?) {
		SettingsPagerPage()
		}

		@Composable
		fun EntryItem() {
		Preference(object : PreferenceModel {
		override val title = "Sample SettingsPager"
		override val onClick = navigator(name)
		})
		}
		}

		@Composable
		private fun SettingsPagerPage() {
		SettingsPager(listOf("Personal", "Work")) {
		Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
		SettingsTitle(title = "Page $it")
		}
		}
		}

		@Preview(showBackground = true)
		@Composable
		private fun SettingsPagerPagePreview() {
		SettingsTheme {
		SettingsPagerPage()
		}
		}

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/theme/SettingsShape.kt

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settingslib.spa.framework.theme

		import androidx.compose.foundation.shape.RoundedCornerShape
		import androidx.compose.ui.unit.dp

		object SettingsShape {
		val CornerMedium = RoundedCornerShape(12.dp)
		}

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

0 → 100644

+60 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settingslib.spa.widget.scaffold

		import androidx.compose.foundation.layout.Column
		import androidx.compose.foundation.layout.padding
		import androidx.compose.material3.TabRow
		import androidx.compose.runtime.Composable
		import androidx.compose.runtime.getValue
		import androidx.compose.runtime.mutableStateOf
		import androidx.compose.runtime.saveable.rememberSaveable
		import androidx.compose.runtime.setValue
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.graphics.Color
		import com.android.settingslib.spa.framework.theme.SettingsDimension

		@Composable
		fun SettingsPager(titles: List<String>, content: @Composable (page: Int) -> Unit) {
		check(titles.isNotEmpty())
		if (titles.size == 1) {
		content(0)
		return
		}

		Column {
		var currentPage by rememberSaveable { mutableStateOf(0) }

		TabRow(
		selectedTabIndex = currentPage,
		modifier = Modifier.padding(horizontal = SettingsDimension.itemPaddingEnd),
		containerColor = Color.Transparent,
		indicator = {},
		divider = {},
		) {
		titles.forEachIndexed { page, title ->
		SettingsTab(
		title = title,
		selected = currentPage == page,
		onClick = { currentPage = page },
		)
		}
		}

		content(currentPage)
		}
		}