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

Commit 580ef265 authored by Tom Hsu's avatar Tom Hsu Committed by Android (Google) Code Review
Browse files

Merge "Expose SatelliteWarningDialogActivity" into 24D1-dev

parents 6f6629e6 180b2d95

AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -5146,7 +5146,8 @@ 
            android:name="com.android.settings.network.SatelliteWarningDialogActivity"

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

            android:excludeFromRecents="true"

            android:exported="false"

            android:exported="true"

            android:permission="android.permission.NETWORK_SETTINGS"

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

        </activity>

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

+5 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import com.android.settings.R 
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



/** A dialog to show the warning message when device is under satellite mode. */

class SatelliteWarningDialogActivity : SpaDialogWindowTypeActivity() {
@@ -41,7 +42,10 @@ class SatelliteWarningDialogActivity : SpaDialogWindowTypeActivity() { 
    }



    override fun getDialogWindowType(): Int {

        return WindowManager.LayoutParams.LAST_APPLICATION_WINDOW

        return intent.getIntExtra(

            WifiUtils.DIALOG_WINDOW_TYPE,

            WindowManager.LayoutParams.LAST_APPLICATION_WINDOW

        )

    }



    @Composable