Merge "[Expressive design] Migrate WifiPrivacyPage." into main (759c5644) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/wifi/details2/WifiPrivacyPageProvider.kt

+26 −30

Original line number	Diff line number	Diff line
		@@ -25,8 +25,6 @@ import android.os.Looper
		import android.os.Process
		import android.os.SimpleClock
		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.getValue
		import androidx.compose.runtime.mutableIntStateOf
		@@ -34,7 +32,6 @@ import androidx.compose.runtime.mutableStateOf
		import androidx.compose.runtime.remember
		import androidx.compose.runtime.saveable.rememberSaveable
		import androidx.compose.runtime.setValue
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.platform.LocalContext
		import androidx.compose.ui.platform.LocalLifecycleOwner
		import androidx.compose.ui.res.stringArrayResource
		@@ -44,14 +41,13 @@ import androidx.navigation.navArgument
		import com.android.settings.R
		import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
		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.ListPreferenceOption
		import com.android.settingslib.spa.widget.preference.RadioPreferences
		import com.android.settingslib.spa.widget.preference.SwitchPreference
		import com.android.settingslib.spa.widget.preference.SwitchPreferenceModel
		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 java.time.Clock
		import java.time.ZoneOffset
		@@ -123,9 +119,8 @@ fun WifiPrivacyPage(wifiEntry: WifiEntry) {

		@Composable
		fun DeviceNameSwitchPreference(wifiEntry: WifiEntry) {
		Spacer(modifier = Modifier.width(SettingsDimension.itemDividerHeight))
		CategoryTitle(title = stringResource(R.string.wifi_privacy_device_name_settings))
		Spacer(modifier = Modifier.width(SettingsDimension.itemDividerHeight))
		val title = stringResource(id = R.string.wifi_privacy_device_name_settings)
		Category(title = title) {
		var checked by remember {
		mutableStateOf(wifiEntry.wifiConfiguration?.isSendDhcpHostnameEnabled)
		}
		@@ -152,6 +147,7 @@ fun DeviceNameSwitchPreference(wifiEntry: WifiEntry) {
		}
		})
		}
		}

		fun onSelectedChange(wifiEntry: WifiEntry, privacy: Int) {
		if (wifiEntry.privacy == privacy) {