[SPA] Add new entry: Network & Internet and Airplane mode

Network & Internet
Screenshot: https://hsv.googleplex.com/6109427053625344

Network & Internet > Airplane mode
https://hsv.googleplex.com/5087887067447296

Bug: 268144349
Test: manual
Change-Id: Ifc6e8db86a5511af7e43394a3f5e356dfadcfe89
This commit is contained in:
Zoey Chen
2023-02-08 18:56:58 +08:00
parent 57258a3765
commit 405aa17b8a
4 changed files with 182 additions and 1 deletions

View File

@@ -34,6 +34,7 @@ import com.android.settings.spa.app.specialaccess.WifiControlAppListProvider
import com.android.settings.spa.app.specialaccess.UseFullScreenIntentAppListProvider import com.android.settings.spa.app.specialaccess.UseFullScreenIntentAppListProvider
import com.android.settings.spa.development.UsageStatsPageProvider import com.android.settings.spa.development.UsageStatsPageProvider
import com.android.settings.spa.home.HomePageProvider import com.android.settings.spa.home.HomePageProvider
import com.android.settings.spa.network.NetworkAndInternetPageProvider
import com.android.settings.spa.notification.AppListNotificationsPageProvider import com.android.settings.spa.notification.AppListNotificationsPageProvider
import com.android.settings.spa.notification.NotificationMainPageProvider import com.android.settings.spa.notification.NotificationMainPageProvider
import com.android.settings.spa.system.AppLanguagesPageProvider import com.android.settings.spa.system.AppLanguagesPageProvider
@@ -79,6 +80,7 @@ open class SettingsSpaEnvironment(context: Context) : SpaEnvironment(context) {
UsageStatsPageProvider, UsageStatsPageProvider,
BackgroundInstalledAppsPageProvider, BackgroundInstalledAppsPageProvider,
CloneAppInfoSettingsProvider, CloneAppInfoSettingsProvider,
NetworkAndInternetPageProvider,
) + togglePermissionAppListTemplate.createPageProviders(), ) + togglePermissionAppListTemplate.createPageProviders(),
rootPages = listOf( rootPages = listOf(
SettingsPage.create(HomePageProvider.name), SettingsPage.create(HomePageProvider.name),

View File

@@ -0,0 +1,81 @@
/**
* Copyright (C) 2023 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.spa.app.network
import android.content.Context
import android.content.pm.PackageManager
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.AirplanemodeActive
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.runtime.livedata.observeAsState
import androidx.compose.ui.platform.LocalContext
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import com.android.settings.AirplaneModeEnabler
import com.android.settings.AirplaneModeEnabler.OnAirplaneModeChangedListener
import com.android.settings.R
import com.android.settingslib.spa.widget.preference.SwitchPreference
import com.android.settingslib.spa.widget.preference.SwitchPreferenceModel
import com.android.settingslib.spa.widget.ui.SettingsIcon
@Composable
fun AirplaneModePreference() {
val context = LocalContext.current
val controller = remember { AirplaneModeController(context) }
if (!controller.isAvailable()) return
SwitchPreference(object : SwitchPreferenceModel {
override val title = context.getString(R.string.airplane_mode)
override val checked = controller.airplaneModeState.observeAsState(
initial = controller.isAirplaneModeOn()
)
override val onCheckedChange = { newChecked: Boolean ->
controller.setChecked(newChecked)
}
override val icon = @Composable {
SettingsIcon(imageVector = Icons.Outlined.AirplanemodeActive)
}
})
}
private class AirplaneModeController(private val context: Context) : OnAirplaneModeChangedListener {
private var airplaneModeEnabler = AirplaneModeEnabler(context, this)!!
private val _airplaneModeState = MutableLiveData<Boolean>()
val airplaneModeState: LiveData<Boolean>
get() = _airplaneModeState
override fun onAirplaneModeChanged(isAirplaneModeOn: Boolean) {
_airplaneModeState.postValue(isAirplaneModeOn)
}
fun isAvailable(): Boolean {
return context.resources.getBoolean(R.bool.config_show_toggle_airplane)
&& !context.packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
}
fun isAirplaneModeOn(): Boolean {
return airplaneModeEnabler.isAirplaneModeOn()
}
fun setChecked(newChecked: Boolean) {
if (isAirplaneModeOn() == newChecked) {
return
}
airplaneModeEnabler.setAirplaneMode(newChecked)
}
}

View File

@@ -0,0 +1,95 @@
/**
* Copyright (C) 2023 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.spa.network
import android.content.Context
import android.os.Bundle
import android.os.UserHandle.myUserId
import android.os.UserManager
import android.os.UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Wifi
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.app.network.AirplaneModePreference
import com.android.settingslib.RestrictedLockUtilsInternal
import com.android.settingslib.Utils
import com.android.settingslib.spa.framework.common.SettingsEntryBuilder
import com.android.settingslib.spa.framework.common.SettingsPageProvider
import com.android.settingslib.spa.framework.common.SpaEnvironmentFactory
import com.android.settingslib.spa.framework.common.createSettingsPage
import com.android.settingslib.spa.framework.compose.navigator
import com.android.settingslib.spa.framework.compose.toState
import com.android.settingslib.spa.widget.preference.Preference
import com.android.settingslib.spa.widget.preference.PreferenceModel
import com.android.settingslib.spa.widget.scaffold.RegularScaffold
import com.android.settingslib.spa.widget.ui.SettingsIcon
object NetworkAndInternetPageProvider : SettingsPageProvider {
override val name = "NetworkAndInternet"
private val owner = createSettingsPage()
@Composable
override fun Page(arguments: Bundle?) {
RegularScaffold(title = getTitle(arguments)) {
AirplaneModePreference()
}
}
override fun getTitle(arguments: Bundle?): String {
return SpaEnvironmentFactory.instance.appContext.getString(R.string.network_dashboard_title)
}
fun buildInjectEntry(): SettingsEntryBuilder {
return SettingsEntryBuilder.createInject(owner = owner)
.setUiLayoutFn {
Preference(object : PreferenceModel {
override val title = stringResource(R.string.network_dashboard_title)
override val summary = stringResource(getSummaryResId()).toState()
override val onClick = navigator(name)
override val icon = @Composable {
SettingsIcon(imageVector = Icons.Outlined.Wifi)
}
})
}
}
@Composable
private fun getSummaryResId(): Int {
val isMobileAvailable = remember { isMobileAvailable() }
var summary = if (isMobileAvailable) {
R.string.network_dashboard_summary_mobile
} else {
R.string.network_dashboard_summary_no_mobile
}
return summary
}
private fun isMobileAvailable(): Boolean {
val context = SpaEnvironmentFactory.instance.appContext
return !isUserRestricted(context) && !Utils.isWifiOnly(context)
}
private fun isUserRestricted(context: Context): Boolean {
val userManager: UserManager = context.getSystemService(UserManager::class.java)!!
return !userManager.isAdminUser || RestrictedLockUtilsInternal.hasBaseUserRestriction(
context, DISALLOW_CONFIG_MOBILE_NETWORKS, myUserId()
)
}
}

View File

@@ -19,6 +19,7 @@ package com.android.settings.spa.home
import android.os.Bundle import android.os.Bundle
import com.android.settings.R import com.android.settings.R
import com.android.settings.spa.app.AppsMainPageProvider import com.android.settings.spa.app.AppsMainPageProvider
import com.android.settings.spa.network.NetworkAndInternetPageProvider
import com.android.settings.spa.notification.NotificationMainPageProvider import com.android.settings.spa.notification.NotificationMainPageProvider
import com.android.settings.spa.system.SystemMainPageProvider import com.android.settings.spa.system.SystemMainPageProvider
import com.android.settingslib.spa.framework.common.SettingsEntry import com.android.settingslib.spa.framework.common.SettingsEntry
@@ -32,6 +33,8 @@ object HomePageProvider : SettingsPageProvider {
override fun buildEntry(arguments: Bundle?): List<SettingsEntry> { override fun buildEntry(arguments: Bundle?): List<SettingsEntry> {
return listOf( return listOf(
NetworkAndInternetPageProvider.buildInjectEntry().setLink(fromPage = owner).build(),
AppsMainPageProvider.buildInjectEntry().setLink(fromPage = owner).build(), AppsMainPageProvider.buildInjectEntry().setLink(fromPage = owner).build(),
NotificationMainPageProvider.buildInjectEntry().setLink(fromPage = owner).build(), NotificationMainPageProvider.buildInjectEntry().setLink(fromPage = owner).build(),
SystemMainPageProvider.buildInjectEntry().setLink(fromPage = owner).build(), SystemMainPageProvider.buildInjectEntry().setLink(fromPage = owner).build(),