Always use Spp to generate SettingsPage in Settings
Bug: 244122804 Test: Manually with Settings Change-Id: I3625d34abcdfd3f7264e20e94043769f1f9ed699
This commit is contained in:
@@ -27,8 +27,8 @@ import androidx.compose.ui.res.stringResource
|
|||||||
import com.android.settings.R
|
import com.android.settings.R
|
||||||
import com.android.settings.spa.app.appinfo.AppInfoSettingsProvider
|
import com.android.settings.spa.app.appinfo.AppInfoSettingsProvider
|
||||||
import com.android.settingslib.spa.framework.common.SettingsEntryBuilder
|
import com.android.settingslib.spa.framework.common.SettingsEntryBuilder
|
||||||
import com.android.settingslib.spa.framework.common.SettingsPage
|
|
||||||
import com.android.settingslib.spa.framework.common.SettingsPageProvider
|
import com.android.settingslib.spa.framework.common.SettingsPageProvider
|
||||||
|
import com.android.settingslib.spa.framework.common.createSettingsPage
|
||||||
import com.android.settingslib.spa.framework.compose.navigator
|
import com.android.settingslib.spa.framework.compose.navigator
|
||||||
import com.android.settingslib.spa.framework.compose.rememberContext
|
import com.android.settingslib.spa.framework.compose.rememberContext
|
||||||
import com.android.settingslib.spa.framework.util.filterItem
|
import com.android.settingslib.spa.framework.util.filterItem
|
||||||
@@ -48,6 +48,7 @@ import kotlinx.coroutines.flow.Flow
|
|||||||
|
|
||||||
object AllAppListPageProvider : SettingsPageProvider {
|
object AllAppListPageProvider : SettingsPageProvider {
|
||||||
override val name = "AllAppList"
|
override val name = "AllAppList"
|
||||||
|
private val owner = createSettingsPage()
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
override fun Page(arguments: Bundle?) {
|
override fun Page(arguments: Bundle?) {
|
||||||
@@ -55,7 +56,7 @@ object AllAppListPageProvider : SettingsPageProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun buildInjectEntry() = SettingsEntryBuilder
|
fun buildInjectEntry() = SettingsEntryBuilder
|
||||||
.createInject(owner = SettingsPage.create(name))
|
.createInject(owner)
|
||||||
.setSearchDataFn { null }
|
.setSearchDataFn { null }
|
||||||
.setUiLayoutFn {
|
.setUiLayoutFn {
|
||||||
Preference(object : PreferenceModel {
|
Preference(object : PreferenceModel {
|
||||||
|
@@ -40,8 +40,8 @@ import com.android.settings.R
|
|||||||
import com.android.settings.spa.app.appinfo.AppInfoSettingsProvider
|
import com.android.settings.spa.app.appinfo.AppInfoSettingsProvider
|
||||||
import com.android.settings.spa.app.startUninstallActivity
|
import com.android.settings.spa.app.startUninstallActivity
|
||||||
import com.android.settingslib.spa.framework.common.SettingsEntryBuilder
|
import com.android.settingslib.spa.framework.common.SettingsEntryBuilder
|
||||||
import com.android.settingslib.spa.framework.common.SettingsPage
|
|
||||||
import com.android.settingslib.spa.framework.common.SettingsPageProvider
|
import com.android.settingslib.spa.framework.common.SettingsPageProvider
|
||||||
|
import com.android.settingslib.spa.framework.common.createSettingsPage
|
||||||
import com.android.settingslib.spa.framework.compose.navigator
|
import com.android.settingslib.spa.framework.compose.navigator
|
||||||
import com.android.settingslib.spa.framework.compose.rememberContext
|
import com.android.settingslib.spa.framework.compose.rememberContext
|
||||||
import com.android.settingslib.spa.framework.theme.SettingsDimension
|
import com.android.settingslib.spa.framework.theme.SettingsDimension
|
||||||
@@ -74,6 +74,7 @@ const val BACKGROUND_INSTALL_CONTROL_FLAG = PackageManager.MATCH_ALL.toLong()
|
|||||||
|
|
||||||
object BackgroundInstalledAppsPageProvider : SettingsPageProvider {
|
object BackgroundInstalledAppsPageProvider : SettingsPageProvider {
|
||||||
override val name = "BackgroundInstalledAppsPage"
|
override val name = "BackgroundInstalledAppsPage"
|
||||||
|
private val owner = createSettingsPage()
|
||||||
private var backgroundInstallService = IBackgroundInstallControlService.Stub.asInterface(
|
private var backgroundInstallService = IBackgroundInstallControlService.Stub.asInterface(
|
||||||
ServiceManager.getService(Context.BACKGROUND_INSTALL_CONTROL_SERVICE))
|
ServiceManager.getService(Context.BACKGROUND_INSTALL_CONTROL_SERVICE))
|
||||||
private var featureIsDisabled = featureIsDisabled()
|
private var featureIsDisabled = featureIsDisabled()
|
||||||
@@ -95,7 +96,7 @@ object BackgroundInstalledAppsPageProvider : SettingsPageProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun buildInjectEntry() = SettingsEntryBuilder
|
fun buildInjectEntry() = SettingsEntryBuilder
|
||||||
.createInject(owner = SettingsPage.create(name))
|
.createInject(owner)
|
||||||
.setSearchDataFn { null }
|
.setSearchDataFn { null }
|
||||||
.setUiLayoutFn { EntryItem() }
|
.setUiLayoutFn { EntryItem() }
|
||||||
|
|
||||||
|
@@ -22,8 +22,8 @@ import androidx.compose.ui.res.stringResource
|
|||||||
import com.android.settings.R
|
import com.android.settings.R
|
||||||
import com.android.settingslib.spa.framework.common.SettingsEntry
|
import com.android.settingslib.spa.framework.common.SettingsEntry
|
||||||
import com.android.settingslib.spa.framework.common.SettingsEntryBuilder
|
import com.android.settingslib.spa.framework.common.SettingsEntryBuilder
|
||||||
import com.android.settingslib.spa.framework.common.SettingsPage
|
|
||||||
import com.android.settingslib.spa.framework.common.SettingsPageProvider
|
import com.android.settingslib.spa.framework.common.SettingsPageProvider
|
||||||
|
import com.android.settingslib.spa.framework.common.createSettingsPage
|
||||||
import com.android.settingslib.spa.framework.compose.navigator
|
import com.android.settingslib.spa.framework.compose.navigator
|
||||||
import com.android.settingslib.spa.widget.preference.Preference
|
import com.android.settingslib.spa.widget.preference.Preference
|
||||||
import com.android.settingslib.spa.widget.preference.PreferenceModel
|
import com.android.settingslib.spa.widget.preference.PreferenceModel
|
||||||
@@ -31,6 +31,7 @@ import com.android.settingslib.spa.widget.scaffold.RegularScaffold
|
|||||||
|
|
||||||
object SpecialAppAccessPageProvider : SettingsPageProvider {
|
object SpecialAppAccessPageProvider : SettingsPageProvider {
|
||||||
override val name = "SpecialAppAccess"
|
override val name = "SpecialAppAccess"
|
||||||
|
private val owner = createSettingsPage()
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
override fun Page(arguments: Bundle?) {
|
override fun Page(arguments: Bundle?) {
|
||||||
@@ -51,10 +52,9 @@ object SpecialAppAccessPageProvider : SettingsPageProvider {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun buildInjectEntry() = SettingsEntryBuilder.createInject(owner = SettingsPage.create(name))
|
fun buildInjectEntry() = SettingsEntryBuilder.createInject(owner)
|
||||||
|
|
||||||
override fun buildEntry(arguments: Bundle?): List<SettingsEntry> {
|
override fun buildEntry(arguments: Bundle?): List<SettingsEntry> {
|
||||||
val owner = SettingsPage.create(name, parameter = parameter, arguments = arguments)
|
|
||||||
return listOf(
|
return listOf(
|
||||||
AllFilesAccessAppListProvider,
|
AllFilesAccessAppListProvider,
|
||||||
DisplayOverOtherAppsAppListProvider,
|
DisplayOverOtherAppsAppListProvider,
|
||||||
|
Reference in New Issue
Block a user