Merge "[WIFI-WEP] Add WEP dialog in System UI." into main

This commit is contained in:
Charlotte Lu
2024-04-23 05:28:37 +00:00
committed by Android (Google) Code Review

View File

@@ -18,6 +18,7 @@ package com.android.settings.network
import android.app.settings.SettingsEnums
import android.net.wifi.WifiManager
import android.view.WindowManager
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
@@ -30,13 +31,11 @@ import com.android.settings.wifi.ConfigureWifiSettings
import com.android.settingslib.spa.SpaDialogWindowTypeActivity
import com.android.settingslib.spa.widget.dialog.AlertDialogButton
import com.android.settingslib.spa.widget.dialog.SettingsAlertDialogContent
import com.android.settingslib.wifi.WifiUtils.Companion.DIALOG_WINDOW_TYPE
import com.android.settingslib.wifi.WifiUtils.Companion.SSID
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
@@ -70,4 +69,11 @@ class WepNetworkDialogActivity : SpaDialogWindowTypeActivity() {
)
})
}
override fun getDialogWindowType(): Int {
return intent.getIntExtra(
DIALOG_WINDOW_TYPE,
WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW
)
}
}