Merge "Disable the middle pages during development" into udc-dev am: e34d95d68e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21469909 Change-Id: Iad2fec07b257570ac6f6195bc0ed8d187337aa4b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -24,10 +24,8 @@ import androidx.compose.ui.res.stringResource
|
|||||||
import com.android.settings.R
|
import com.android.settings.R
|
||||||
import com.android.settings.spa.app.backgroundinstall.BackgroundInstalledAppsPageProvider
|
import com.android.settings.spa.app.backgroundinstall.BackgroundInstalledAppsPageProvider
|
||||||
import com.android.settings.spa.app.specialaccess.SpecialAppAccessPageProvider
|
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.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.SpaEnvironmentFactory
|
import com.android.settingslib.spa.framework.common.SpaEnvironmentFactory
|
||||||
import com.android.settingslib.spa.framework.common.createSettingsPage
|
import com.android.settingslib.spa.framework.common.createSettingsPage
|
||||||
@@ -42,6 +40,8 @@ object AppsMainPageProvider : SettingsPageProvider {
|
|||||||
override val name = "AppsMain"
|
override val name = "AppsMain"
|
||||||
private val owner = createSettingsPage()
|
private val owner = createSettingsPage()
|
||||||
|
|
||||||
|
override fun isEnabled(arguments: Bundle?) = false
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
override fun Page(arguments: Bundle?) {
|
override fun Page(arguments: Bundle?) {
|
||||||
RegularScaffold(title = getTitle(arguments)) {
|
RegularScaffold(title = getTitle(arguments)) {
|
||||||
|
@@ -33,6 +33,8 @@ object SpecialAppAccessPageProvider : SettingsPageProvider {
|
|||||||
override val name = "SpecialAppAccess"
|
override val name = "SpecialAppAccess"
|
||||||
private val owner = createSettingsPage()
|
private val owner = createSettingsPage()
|
||||||
|
|
||||||
|
override fun isEnabled(arguments: Bundle?) = false
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
override fun Page(arguments: Bundle?) {
|
override fun Page(arguments: Bundle?) {
|
||||||
RegularScaffold(title = stringResource(R.string.special_access)) {
|
RegularScaffold(title = stringResource(R.string.special_access)) {
|
||||||
|
@@ -31,6 +31,8 @@ object HomePageProvider : SettingsPageProvider {
|
|||||||
override val name = "Home"
|
override val name = "Home"
|
||||||
private val owner = createSettingsPage()
|
private val owner = createSettingsPage()
|
||||||
|
|
||||||
|
override fun isEnabled(arguments: Bundle?) = false
|
||||||
|
|
||||||
override fun buildEntry(arguments: Bundle?): List<SettingsEntry> {
|
override fun buildEntry(arguments: Bundle?): List<SettingsEntry> {
|
||||||
return listOf(
|
return listOf(
|
||||||
|
|
||||||
|
@@ -27,7 +27,6 @@ import androidx.compose.runtime.Composable
|
|||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
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.network.AirplaneModePreference
|
|
||||||
import com.android.settingslib.RestrictedLockUtilsInternal
|
import com.android.settingslib.RestrictedLockUtilsInternal
|
||||||
import com.android.settingslib.Utils
|
import com.android.settingslib.Utils
|
||||||
import com.android.settingslib.spa.framework.common.SettingsEntryBuilder
|
import com.android.settingslib.spa.framework.common.SettingsEntryBuilder
|
||||||
@@ -45,6 +44,8 @@ object NetworkAndInternetPageProvider : SettingsPageProvider {
|
|||||||
override val name = "NetworkAndInternet"
|
override val name = "NetworkAndInternet"
|
||||||
private val owner = createSettingsPage()
|
private val owner = createSettingsPage()
|
||||||
|
|
||||||
|
override fun isEnabled(arguments: Bundle?) = false
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
override fun Page(arguments: Bundle?) {
|
override fun Page(arguments: Bundle?) {
|
||||||
RegularScaffold(title = getTitle(arguments)) {
|
RegularScaffold(title = getTitle(arguments)) {
|
||||||
|
@@ -37,6 +37,8 @@ object NotificationMainPageProvider : SettingsPageProvider {
|
|||||||
override val name = "NotificationMain"
|
override val name = "NotificationMain"
|
||||||
private val owner = createSettingsPage()
|
private val owner = createSettingsPage()
|
||||||
|
|
||||||
|
override fun isEnabled(arguments: Bundle?) = false
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
override fun Page(arguments: Bundle?) {
|
override fun Page(arguments: Bundle?) {
|
||||||
RegularScaffold(title = getTitle(arguments)) {
|
RegularScaffold(title = getTitle(arguments)) {
|
||||||
|
@@ -33,6 +33,8 @@ import com.android.settingslib.spa.widget.ui.SettingsIcon
|
|||||||
object LanguageAndInputPageProvider : SettingsPageProvider {
|
object LanguageAndInputPageProvider : SettingsPageProvider {
|
||||||
override val name = "LanguageAndInput"
|
override val name = "LanguageAndInput"
|
||||||
|
|
||||||
|
override fun isEnabled(arguments: Bundle?) = false
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
override fun Page(arguments: Bundle?) {
|
override fun Page(arguments: Bundle?) {
|
||||||
LanguageAndInput()
|
LanguageAndInput()
|
||||||
|
@@ -37,6 +37,8 @@ object SystemMainPageProvider : SettingsPageProvider {
|
|||||||
override val name = "SystemMain"
|
override val name = "SystemMain"
|
||||||
private val owner = createSettingsPage()
|
private val owner = createSettingsPage()
|
||||||
|
|
||||||
|
override fun isEnabled(arguments: Bundle?) = false
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
override fun Page(arguments: Bundle?) {
|
override fun Page(arguments: Bundle?) {
|
||||||
RegularScaffold(title = getTitle(arguments)) {
|
RegularScaffold(title = getTitle(arguments)) {
|
||||||
|
Reference in New Issue
Block a user