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

Merge "Expose SatelliteWarningDialogActivity" into main

Browse Source
This commit is contained in:
Tom Hsu
2024-05-09 11:17:06 +00:00
committed by Android (Google) Code Review
parent 8e4223c769 a50dd92e49
commit c5571e5530
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AndroidManifest.xml
View File

@@ -5190,7 +5190,8 @@
android:name="com.android.settings.network.SatelliteWarningDialogActivity" android:name="com.android.settings.network.SatelliteWarningDialogActivity"
android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout|smallestScreenSize" android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout|smallestScreenSize"
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:exported="false" android:exported="true"
android:permission="android.permission.NETWORK_SETTINGS"
android:theme="@style/Theme.SpaLib.Dialog"> android:theme="@style/Theme.SpaLib.Dialog">
</activity> </activity>

6
src/com/android/settings/network/SatelliteWarningDialogActivity.kt
View File

@@ -27,6 +27,7 @@ import com.android.settings.R
import com.android.settingslib.spa.SpaDialogWindowTypeActivity 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.SettingsAlertDialogContent import com.android.settingslib.spa.widget.dialog.SettingsAlertDialogContent
import com.android.settingslib.wifi.WifiUtils
/** A dialog to show the warning message when device is under satellite mode. */ /** A dialog to show the warning message when device is under satellite mode. */
class SatelliteWarningDialogActivity : SpaDialogWindowTypeActivity() { class SatelliteWarningDialogActivity : SpaDialogWindowTypeActivity() {
@@ -41,7 +42,10 @@ class SatelliteWarningDialogActivity : SpaDialogWindowTypeActivity() {
} }
override fun getDialogWindowType(): Int { override fun getDialogWindowType(): Int {
return WindowManager.LayoutParams.LAST_APPLICATION_WINDOW return intent.getIntExtra(
WifiUtils.DIALOG_WINDOW_TYPE,
WindowManager.LayoutParams.LAST_APPLICATION_WINDOW
)
} }
@Composable @Composable