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

Commit 9cfbe609 authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "Use SpaDialogWindowTypeActivity for WEP dialog" into main

parents cdd9b78e 51a4bea7

AndroidManifest.xml

+4 −2
Original line number Diff line number Diff line
@@ -5184,9 +5184,11 @@ 


        <activity

            android:name="com.android.settings.network.WepNetworkDialogActivity"

            android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout|smallestScreenSize"

            android:excludeFromRecents="true"

            android:exported="true"

            android:theme="@style/Theme.SpaLib.Dialog"

            android:permission="android.permission.NETWORK_SETTINGS">

            android:permission="android.permission.NETWORK_SETTINGS"

            android:theme="@style/Theme.SpaLib.Dialog">

        </activity>



        <!-- This is the longest AndroidManifest.xml ever. -->

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

+9 −6
Original line number Diff line number Diff line
@@ -27,18 +27,21 @@ import androidx.compose.ui.text.style.TextAlign 
import com.android.settings.R

import com.android.settings.core.SubSettingLauncher

import com.android.settings.wifi.ConfigureWifiSettings

import com.android.settingslib.spa.SpaBaseDialogActivity

import com.android.settingslib.spa.SpaDialogWindowTypeActivity

import com.android.settingslib.spa.widget.dialog.AlertDialogButton

import com.android.settingslib.spa.widget.dialog.SettingsAlertDialogWithIcon

import com.android.settingslib.spa.widget.dialog.SettingsAlertDialogContent

import com.android.settingslib.wifi.WifiUtils.Companion.SSID



class WepNetworkDialogActivity : SpaBaseDialogActivity() {

class WepNetworkDialogActivity : SpaDialogWindowTypeActivity() {



    // TODO: Set different window type when called from Quick Settings.

    override val dialogWindowType = null



    @Composable

    override fun Content() {

        val context = LocalContext.current

        val wifiManager = context.getSystemService(WifiManager::class.java)

        SettingsAlertDialogWithIcon(

            onDismissRequest = { finish() },

        SettingsAlertDialogContent(

            confirmButton = AlertDialogButton(

                getString(R.string.wifi_settings_ssid_block_button_close)

            ) { finish() },