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

Merge "[Expressive design] Migrate WifiPrivacyPage." into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-12-09 07:55:43 +00:00
committed by Android (Google) Code Review
parent 6123cb9aeb 8394517609
commit 759c5644d1
1 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/wifi/details2/WifiPrivacyPageProvider.kt
View File

@@ -25,8 +25,6 @@ import android.os.Looper
import android.os.Process import android.os.Process
import android.os.SimpleClock import android.os.SimpleClock
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.width
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableIntStateOf
@@ -34,7 +32,6 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.compose.ui.platform.LocalLifecycleOwner
import androidx.compose.ui.res.stringArrayResource import androidx.compose.ui.res.stringArrayResource
@@ -44,14 +41,13 @@ import androidx.navigation.navArgument
import com.android.settings.R import com.android.settings.R
import com.android.settings.overlay.FeatureFactory.Companion.featureFactory import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
import com.android.settingslib.spa.framework.common.SettingsPageProvider import com.android.settingslib.spa.framework.common.SettingsPageProvider
import com.android.settingslib.spa.framework.theme.SettingsDimension
import com.android.settingslib.spa.widget.preference.ListPreferenceModel import com.android.settingslib.spa.widget.preference.ListPreferenceModel
import com.android.settingslib.spa.widget.preference.ListPreferenceOption import com.android.settingslib.spa.widget.preference.ListPreferenceOption
import com.android.settingslib.spa.widget.preference.RadioPreferences import com.android.settingslib.spa.widget.preference.RadioPreferences
import com.android.settingslib.spa.widget.preference.SwitchPreference import com.android.settingslib.spa.widget.preference.SwitchPreference
import com.android.settingslib.spa.widget.preference.SwitchPreferenceModel import com.android.settingslib.spa.widget.preference.SwitchPreferenceModel
import com.android.settingslib.spa.widget.scaffold.RegularScaffold import com.android.settingslib.spa.widget.scaffold.RegularScaffold
import com.android.settingslib.spa.widget.ui.CategoryTitle import com.android.settingslib.spa.widget.ui.Category
import com.android.wifitrackerlib.WifiEntry import com.android.wifitrackerlib.WifiEntry
import java.time.Clock import java.time.Clock
import java.time.ZoneOffset import java.time.ZoneOffset
@@ -123,9 +119,8 @@ fun WifiPrivacyPage(wifiEntry: WifiEntry) {
@Composable @Composable
fun DeviceNameSwitchPreference(wifiEntry: WifiEntry) { fun DeviceNameSwitchPreference(wifiEntry: WifiEntry) {
Spacer(modifier = Modifier.width(SettingsDimension.itemDividerHeight)) val title = stringResource(id = R.string.wifi_privacy_device_name_settings)
CategoryTitle(title = stringResource(R.string.wifi_privacy_device_name_settings)) Category(title = title) {
Spacer(modifier = Modifier.width(SettingsDimension.itemDividerHeight))
var checked by remember { var checked by remember {
mutableStateOf(wifiEntry.wifiConfiguration?.isSendDhcpHostnameEnabled) mutableStateOf(wifiEntry.wifiConfiguration?.isSendDhcpHostnameEnabled)
} }
@@ -151,6 +146,7 @@ fun DeviceNameSwitchPreference(wifiEntry: WifiEntry) {
} }
} }
}) })
}
} }
fun onSelectedChange(wifiEntry: WifiEntry, privacy: Int) { fun onSelectedChange(wifiEntry: WifiEntry, privacy: Int) {