Add param name when use SettingsEntry.createInject api.

Use SettingsPage.create api to create SettingsPage.
Remove debug button in HOME page.

Bug: 244122804
Test: manual - build SettingsGoogle
Change-Id: I59b6f4c0ead0b3f0dc06eb238b074d2cf91cf74c
This commit is contained in:
Zekan Qian
2022-09-08 16:12:43 +08:00
parent e68cf6df7d
commit 6243eb3ec9
4 changed files with 3 additions and 17 deletions

View File

@@ -46,7 +46,7 @@ object SpaEnvironment {
AppListNotificationsPageProvider, AppListNotificationsPageProvider,
) + togglePermissionAppListTemplate.createPageProviders(), ) + togglePermissionAppListTemplate.createPageProviders(),
rootPages = listOf( rootPages = listOf(
SettingsPage(HomePageProvider.name), SettingsPage.create(HomePageProvider.name),
), ),
) )
} }

View File

@@ -56,7 +56,7 @@ object AppsMainPageProvider : SettingsPageProvider {
} }
fun buildInjectEntry() = fun buildInjectEntry() =
SettingsEntryBuilder.createInject(SettingsPage.create(name)).setIsAllowSearch(false) SettingsEntryBuilder.createInject(owner = SettingsPage.create(name)).setIsAllowSearch(false)
override fun buildEntry(arguments: Bundle?): List<SettingsEntry> { override fun buildEntry(arguments: Bundle?): List<SettingsEntry> {
val owner = SettingsPage.create(name, parameter, arguments) val owner = SettingsPage.create(name, parameter, arguments)

View File

@@ -46,7 +46,7 @@ object SpecialAppAccessPageProvider : SettingsPageProvider {
} }
fun buildInjectEntry() = fun buildInjectEntry() =
SettingsEntryBuilder.createInject(SettingsPage.create(name)).setIsAllowSearch(false) SettingsEntryBuilder.createInject(owner = SettingsPage.create(name)).setIsAllowSearch(false)
override fun buildEntry(arguments: Bundle?): List<SettingsEntry> { override fun buildEntry(arguments: Bundle?): List<SettingsEntry> {
val owner = SettingsPage.create(name, parameter, arguments) val owner = SettingsPage.create(name, parameter, arguments)

View File

@@ -17,12 +17,9 @@
package com.android.settings.spa.home package com.android.settings.spa.home
import android.os.Bundle import android.os.Bundle
import androidx.compose.material3.Button
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import com.android.settings.R import com.android.settings.R
import com.android.settings.spa.SpaEnvironment
import com.android.settings.spa.app.AppsMainPageProvider import com.android.settings.spa.app.AppsMainPageProvider
import com.android.settings.spa.notification.NotificationMainPageProvider import com.android.settings.spa.notification.NotificationMainPageProvider
import com.android.settingslib.spa.framework.common.SettingsEntry import com.android.settingslib.spa.framework.common.SettingsEntry
@@ -51,16 +48,5 @@ private fun HomePage() {
HomeScaffold(title = stringResource(R.string.settings_label)) { HomeScaffold(title = stringResource(R.string.settings_label)) {
AppsMainPageProvider.EntryItem() AppsMainPageProvider.EntryItem()
NotificationMainPageProvider.EntryItem() NotificationMainPageProvider.EntryItem()
/**
* A test button to generate hierarchy.
* TODO: remove it once the content provider is ready.
*/
Button(onClick = {
SpaEnvironment.settingsEntryRepository.printAllPages()
SpaEnvironment.settingsEntryRepository.printAllEntries()
}) {
Text(text = "Generate Entry")
}
} }
} }