From 6871807a95b1d4a68489e1e56270db92b12251bb Mon Sep 17 00:00:00 2001 From: changbetty Date: Tue, 29 Jun 2021 06:43:11 +0000 Subject: [PATCH 1/2] Set the attribute of the dialog window for overlay QS internet panel Bug: 190460969 Test: Manual test Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialog2Test Change-Id: I1acdfb09393163bb94824fe2b3bad0391ba4fb53 Merged-In: I1acdfb09393163bb94824fe2b3bad0391ba4fb53 --- src/com/android/settings/wifi/WifiDialog2.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/com/android/settings/wifi/WifiDialog2.java b/src/com/android/settings/wifi/WifiDialog2.java index dc546f3c231..52f3e74a42d 100644 --- a/src/com/android/settings/wifi/WifiDialog2.java +++ b/src/com/android/settings/wifi/WifiDialog2.java @@ -21,6 +21,9 @@ import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; import android.view.View; +import android.view.Window; +import android.view.WindowInsets; +import android.view.WindowManager; import android.widget.Button; import android.widget.ImageButton; import android.widget.TextView; @@ -108,6 +111,8 @@ public class WifiDialog2 extends AlertDialog implements WifiConfigUiBase2, @Override protected void onCreate(Bundle savedInstanceState) { + setWindowsOverlay(); + mView = getLayoutInflater().inflate(R.layout.wifi_dialog, /* root */ null); setView(mView); mController = new WifiConfigController2(this, mView, mWifiEntry, mMode); @@ -126,6 +131,16 @@ public class WifiDialog2 extends AlertDialog implements WifiConfigUiBase2, } } + private void setWindowsOverlay() { + final Window window = getWindow(); + final WindowManager.LayoutParams lp = window.getAttributes(); + window.setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG); + lp.setFitInsetsTypes(WindowInsets.Type.statusBars() | WindowInsets.Type.navigationBars()); + lp.setFitInsetsSides(WindowInsets.Side.all()); + lp.setFitInsetsIgnoringVisibility(true); + window.setAttributes(lp); + } + @Override protected void onStart() { final ImageButton ssidScannerButton = findViewById(R.id.ssid_scanner_button); From 3043c87f98b9f130249c26cee9c8da505e5503d3 Mon Sep 17 00:00:00 2001 From: changbetty Date: Fri, 9 Jul 2021 03:16:39 +0000 Subject: [PATCH 2/2] Remove some attributes to move the dialog window up Bug: 192815830 Test: Manual test Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialog2Test Change-Id: Ia8ce6cfa19cd5d57695dc0092b1585d8cad5a8d7 Merged-In: Ia8ce6cfa19cd5d57695dc0092b1585d8cad5a8d7 --- src/com/android/settings/wifi/WifiDialog2.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/com/android/settings/wifi/WifiDialog2.java b/src/com/android/settings/wifi/WifiDialog2.java index 52f3e74a42d..05dad3f1b96 100644 --- a/src/com/android/settings/wifi/WifiDialog2.java +++ b/src/com/android/settings/wifi/WifiDialog2.java @@ -22,7 +22,6 @@ import android.content.DialogInterface; import android.os.Bundle; import android.view.View; import android.view.Window; -import android.view.WindowInsets; import android.view.WindowManager; import android.widget.Button; import android.widget.ImageButton; @@ -135,9 +134,6 @@ public class WifiDialog2 extends AlertDialog implements WifiConfigUiBase2, final Window window = getWindow(); final WindowManager.LayoutParams lp = window.getAttributes(); window.setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG); - lp.setFitInsetsTypes(WindowInsets.Type.statusBars() | WindowInsets.Type.navigationBars()); - lp.setFitInsetsSides(WindowInsets.Side.all()); - lp.setFitInsetsIgnoringVisibility(true); window.setAttributes(lp); }