commit a955648be4bb41b06349a8a935011ed7c3c23911
author Weng Su <wengsu@google.com> Fri May 03 21:12:54 2024 +0800
committer Weng Su <wengsu@google.com> Fri May 03 21:12:54 2024 +0800
tree f7551f5a924caddfa96a00aed31d52c5b8d737ef
parent e1303ffa3ac219c181fe2b8b19d9318fdab491c4

Don't set the Wi-Fi dialog to the topmost UI

- Set Wi-Fi dialog to topmost UI only when called by SysUI

Bug: 293965733
Flag: None
Test: Manual testing
atest -c WifiDialogActivityTest

Change-Id: I9215b3e7f86c0d31fa0c4c492f29032c3d14ad6d

src/com/android/settings/wifi/WifiDialog2.kt

diff --git a/src/com/android/settings/wifi/WifiDialog2.kt b/src/com/android/settings/wifi/WifiDialog2.kt
index a0d215a..2b89e4b 100644
--- a/src/com/android/settings/wifi/WifiDialog2.kt
+++ b/src/com/android/settings/wifi/WifiDialog2.kt
@@ -44,6 +44,7 @@
     @StyleRes style: Int = 0,
     private val hideSubmitButton: Boolean = mode == WifiConfigUiBase2.MODE_VIEW,
     private val hideMeteredAndPrivacy: Boolean = false,
+    private val isSysUiCaller: Boolean = false,
 ) : AlertDialog(context, style), WifiConfigUiBase2, DialogInterface.OnClickListener {
     /**
      * Host UI component of WifiDialog2 can receive callbacks by this interface.
@@ -71,7 +72,9 @@
     override fun getController(): WifiConfigController2 = controller
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        setWindowsOverlay()
+        if (isSysUiCaller) {
+            setWindowsOverlay()
+        }
         view = layoutInflater.inflate(R.layout.wifi_dialog, null)
         setView(view)
         controller = WifiConfigController2(this, view, wifiEntry, mode, hideMeteredAndPrivacy)

src/com/android/settings/wifi/WifiDialogActivity.java

diff --git a/src/com/android/settings/wifi/WifiDialogActivity.java b/src/com/android/settings/wifi/WifiDialogActivity.java
index eb3d88a..951277a 100644
--- a/src/com/android/settings/wifi/WifiDialogActivity.java
+++ b/src/com/android/settings/wifi/WifiDialogActivity.java
@@ -43,6 +43,7 @@
 
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
+import com.android.settings.Utils;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.wifi.dpp.WifiDppUtils;
 import com.android.settingslib.core.lifecycle.ObservableActivity;
@@ -172,7 +173,10 @@
         } else {
             if (mIsWifiTrackerLib) {
                 mDialog2 = new WifiDialog2(this, this,
-                        mNetworkDetailsTracker.getWifiEntry(), WifiConfigUiBase2.MODE_CONNECT);
+                        mNetworkDetailsTracker.getWifiEntry(), WifiConfigUiBase2.MODE_CONNECT,
+                        0 /* style */, false /* hideSubmitButton */,
+                        false /* hideMeteredAndPrivacy */,
+                        Utils.SYSTEMUI_PACKAGE_NAME.equals(getLaunchedFromPackage()));
             } else {
                 mDialog = WifiDialog.createModal(
                         this, this, mAccessPoint, WifiConfigUiBase.MODE_CONNECT);