PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use SpaDialogWindowTypeActivity for WEP dialog

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

Bug: 332643450
Test: am start -n com.android.settings/.network.WepNetworkDialogActivity
Change-Id: Ie888e7cc116234199316b030fb5f35dea6dbb3ac
This commit is contained in:
Chaohui Wang
2024-04-03 15:23:44 +08:00
parent 854785bebb
commit 51a4bea7d9
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AndroidManifest.xml
View File

@@ -5184,9 +5184,11 @@
<activity <activity
android:name="com.android.settings.network.WepNetworkDialogActivity" android:name="com.android.settings.network.WepNetworkDialogActivity"
android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout|smallestScreenSize"
android:excludeFromRecents="true"
android:exported="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> </activity>
<!-- This is the longest AndroidManifest.xml ever. --> <!-- This is the longest AndroidManifest.xml ever. -->

15
src/com/android/settings/network/WepNetworkDialogActivity.kt
View File

@@ -27,18 +27,21 @@ import androidx.compose.ui.text.style.TextAlign
import com.android.settings.R import com.android.settings.R
import com.android.settings.core.SubSettingLauncher import com.android.settings.core.SubSettingLauncher
import com.android.settings.wifi.ConfigureWifiSettings 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.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 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 @Composable
override fun Content() { override fun Content() {
val context = LocalContext.current val context = LocalContext.current
val wifiManager = context.getSystemService(WifiManager::class.java) val wifiManager = context.getSystemService(WifiManager::class.java)
SettingsAlertDialogWithIcon( SettingsAlertDialogContent(
onDismissRequest = { finish() },
confirmButton = AlertDialogButton( confirmButton = AlertDialogButton(
getString(R.string.wifi_settings_ssid_block_button_close) getString(R.string.wifi_settings_ssid_block_button_close)
) { finish() }, ) { finish() },
@@ -67,4 +70,4 @@ class WepNetworkDialogActivity : SpaBaseDialogActivity() {
) )
}) })
} }
} }