Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Modify the format of the wep warning dialog" into main

Browse Source
This commit is contained in:
Charlotte Lu
2024-01-24 05:06:12 +00:00
committed by Android (Google) Code Review
parent 96d8953e15 27a8deeb4a
commit 9bdb3b58e5
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/network/WepNetworkDialogActivity.kt
View File

@@ -51,7 +51,8 @@ class WepNetworkDialogActivity : SpaBaseDialogActivity() {
confirmButton = AlertDialogButton( confirmButton = AlertDialogButton(
getString(R.string.wifi_settings_ssid_block_button_close) getString(R.string.wifi_settings_ssid_block_button_close)
) { finish() }, ) { finish() },
dismissButton = AlertDialogButton( dismissButton = if (wifiManager?.isWepSupported == true)
AlertDialogButton(
getString(R.string.wifi_settings_wep_networks_button_allow) getString(R.string.wifi_settings_wep_networks_button_allow)
) { ) {
SubSettingLauncher(context) SubSettingLauncher(context)
@@ -60,14 +61,14 @@ class WepNetworkDialogActivity : SpaBaseDialogActivity() {
.setDestination(ConfigureWifiSettings::class.java.getName()) .setDestination(ConfigureWifiSettings::class.java.getName())
.launch() .launch()
finish() finish()
}, } else null,
title = String.format( title = String.format(
getString(R.string.wifi_settings_wep_networks_blocked_title), getString(R.string.wifi_settings_wep_networks_blocked_title),
intent.getStringExtra(SSID) ?: SSID intent.getStringExtra(SSID) ?: SSID
), ),
text = { text = {
Text( Text(
if (wifiManager?.isWepSupported == false) if (wifiManager?.isWepSupported == true)
getString(R.string.wifi_settings_wep_networks_summary_toggle_off) getString(R.string.wifi_settings_wep_networks_summary_toggle_off)
else getString(R.string.wifi_settings_wep_networks_summary_blocked_by_carrier), else getString(R.string.wifi_settings_wep_networks_summary_blocked_by_carrier),
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),