PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21469909

Change-Id: Id4602df190b9ce51ad688635772662b27f673289
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chaohui Wang
2023-02-28 19:47:17 +00:00
committed by Automerger Merge Worker
parent 1b34eb83ea e34d95d68e
commit 68e47490d6
7 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/spa/app/AppsMain.kt
View File

@@ -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)) {

2
src/com/android/settings/spa/app/specialaccess/SpecialAppAccess.kt
View File

@@ -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)) {

2
src/com/android/settings/spa/home/HomePage.kt
View File

@@ -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(

3
src/com/android/settings/spa/network/NetworkAndInternet.kt
View File

@@ -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)) {

2
src/com/android/settings/spa/notification/NotificationMain.kt
View File

@@ -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)) {

2
src/com/android/settings/spa/system/LanguageAndInputPageProvider.kt
View File

@@ -33,6 +33,8 @@ import com.android.settingslib.spa.widget.ui.SettingsIcon
object LanguageAndInputPageProvider : SettingsPageProvider {
override val name = "LanguageAndInput"
override fun isEnabled(arguments: Bundle?) = false
@Composable
override fun Page(arguments: Bundle?) {
LanguageAndInput()

2
src/com/android/settings/spa/system/SystemMain.kt
View File

@@ -37,6 +37,8 @@ object SystemMainPageProvider : SettingsPageProvider {
override val name = "SystemMain"
private val owner = createSettingsPage()
override fun isEnabled(arguments: Bundle?) = false
@Composable
override fun Page(arguments: Bundle?) {
RegularScaffold(title = getTitle(arguments)) {