Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bdb3b58 authored by Charlotte Lu's avatar Charlotte Lu Committed by Android (Google) Code Review
Browse files

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

parents 96d8953e 27a8deeb

src/com/android/settings/network/WepNetworkDialogActivity.kt

+12 −11
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ class WepNetworkDialogActivity : SpaBaseDialogActivity() { 
            confirmButton = AlertDialogButton(

                getString(R.string.wifi_settings_ssid_block_button_close)

            ) { finish() },

            dismissButton = AlertDialogButton(

            dismissButton = if (wifiManager?.isWepSupported == true)

                AlertDialogButton(

                    getString(R.string.wifi_settings_wep_networks_button_allow)

                ) {

                    SubSettingLauncher(context)
@@ -60,14 +61,14 @@ class WepNetworkDialogActivity : SpaBaseDialogActivity() { 
                        .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(),