Use SpaDialogWindowTypeActivity for WEP dialog
TODO: Set different window type when called from Quick Settings.
Bug: 332643450
Test: am start -n com.android.settings/.network.WepNetworkDialogActivity
Change-Id: Ie888e7cc116234199316b030fb5f35dea6dbb3ac
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f374c38..2b2a1b8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -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. -->
diff --git a/src/com/android/settings/network/WepNetworkDialogActivity.kt b/src/com/android/settings/network/WepNetworkDialogActivity.kt
index fef93ef..d6fa795 100644
--- a/src/com/android/settings/network/WepNetworkDialogActivity.kt
+++ b/src/com/android/settings/network/WepNetworkDialogActivity.kt
@@ -27,18 +27,21 @@
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() },
@@ -67,4 +70,4 @@
)
})
}
-}
\ No newline at end of file
+}