Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e34d95d6 authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "Disable the middle pages during development" into udc-dev

parents de100183 f37d6384

src/com/android/settings/spa/app/AppsMain.kt

+2 −2
Original line number Diff line number Diff line
@@ -24,10 +24,8 @@ import androidx.compose.ui.res.stringResource 
import com.android.settings.R

import com.android.settings.spa.app.backgroundinstall.BackgroundInstalledAppsPageProvider

import com.android.settings.spa.app.specialaccess.SpecialAppAccessPageProvider

import com.android.settings.spa.home.HomePageProvider

import com.android.settingslib.spa.framework.common.SettingsEntry

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.SpaEnvironmentFactory

import com.android.settingslib.spa.framework.common.createSettingsPage
@@ -42,6 +40,8 @@ object AppsMainPageProvider : SettingsPageProvider { 
    override val name = "AppsMain"

    private val owner = createSettingsPage()



    override fun isEnabled(arguments: Bundle?) = false



    @Composable

    override fun Page(arguments: Bundle?) {

        RegularScaffold(title = getTitle(arguments)) {

src/com/android/settings/spa/app/specialaccess/SpecialAppAccess.kt

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ object SpecialAppAccessPageProvider : SettingsPageProvider { 
    override val name = "SpecialAppAccess"

    private val owner = createSettingsPage()



    override fun isEnabled(arguments: Bundle?) = false



    @Composable

    override fun Page(arguments: Bundle?) {

        RegularScaffold(title = stringResource(R.string.special_access)) {

src/com/android/settings/spa/home/HomePage.kt

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ object HomePageProvider : SettingsPageProvider { 
    override val name = "Home"

    private val owner = createSettingsPage()



    override fun isEnabled(arguments: Bundle?) = false



    override fun buildEntry(arguments: Bundle?): List<SettingsEntry> {

        return listOf(

src/com/android/settings/spa/network/NetworkAndInternet.kt

+2 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import androidx.compose.runtime.Composable 
import androidx.compose.runtime.remember

import androidx.compose.ui.res.stringResource

import com.android.settings.R

import com.android.settings.spa.network.AirplaneModePreference

import com.android.settingslib.RestrictedLockUtilsInternal

import com.android.settingslib.Utils

import com.android.settingslib.spa.framework.common.SettingsEntryBuilder
@@ -45,6 +44,8 @@ object NetworkAndInternetPageProvider : SettingsPageProvider { 
    override val name = "NetworkAndInternet"

    private val owner = createSettingsPage()



    override fun isEnabled(arguments: Bundle?) = false



    @Composable

    override fun Page(arguments: Bundle?) {

        RegularScaffold(title = getTitle(arguments)) {

src/com/android/settings/spa/notification/NotificationMain.kt

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ object NotificationMainPageProvider : SettingsPageProvider { 
    override val name = "NotificationMain"

    private val owner = createSettingsPage()



    override fun isEnabled(arguments: Bundle?) = false



    @Composable

    override fun Page(arguments: Bundle?) {

        RegularScaffold(title = getTitle(arguments)) {