From 27a8deeb4aae849720d2ded63778aac8b7442edf Mon Sep 17 00:00:00 2001 From: Charlotte Lu Date: Tue, 23 Jan 2024 12:59:23 +0800 Subject: [PATCH] Modify the format of the wep warning dialog Test: Visual Test Fix: 321855606 Change-Id: I1156f3305685f2253752a7a1d99b16d3eede55f9 --- .../network/WepNetworkDialogActivity.kt | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/com/android/settings/network/WepNetworkDialogActivity.kt b/src/com/android/settings/network/WepNetworkDialogActivity.kt index 2fa87849ef1..d69630f6826 100644 --- a/src/com/android/settings/network/WepNetworkDialogActivity.kt +++ b/src/com/android/settings/network/WepNetworkDialogActivity.kt @@ -51,23 +51,24 @@ class WepNetworkDialogActivity : SpaBaseDialogActivity() { confirmButton = AlertDialogButton( getString(R.string.wifi_settings_ssid_block_button_close) ) { finish() }, - dismissButton = AlertDialogButton( - getString(R.string.wifi_settings_wep_networks_button_allow) - ) { - SubSettingLauncher(context) - .setTitleText(context.getText(R.string.network_and_internet_preferences_title)) - .setSourceMetricsCategory(SettingsEnums.CONFIGURE_WIFI) - .setDestination(ConfigureWifiSettings::class.java.getName()) - .launch() - finish() - }, + dismissButton = if (wifiManager?.isWepSupported == true) + AlertDialogButton( + getString(R.string.wifi_settings_wep_networks_button_allow) + ) { + SubSettingLauncher(context) + .setTitleText(context.getText(R.string.network_and_internet_preferences_title)) + .setSourceMetricsCategory(SettingsEnums.CONFIGURE_WIFI) + .setDestination(ConfigureWifiSettings::class.java.getName()) + .launch() + finish() + } else null, title = String.format( getString(R.string.wifi_settings_wep_networks_blocked_title), intent.getStringExtra(SSID) ?: SSID ), text = { Text( - if (wifiManager?.isWepSupported == false) + if (wifiManager?.isWepSupported == true) getString(R.string.wifi_settings_wep_networks_summary_toggle_off) else getString(R.string.wifi_settings_wep_networks_summary_blocked_by_carrier), modifier = Modifier.fillMaxWidth(),