From 04b990a536494e1fe871a5f70eade792a4ca25c9 Mon Sep 17 00:00:00 2001 From: Behnam Heydarshahi Date: Tue, 8 Apr 2025 13:59:15 -0700 Subject: [SP 2025-09-01] Unexport ControlsActivity Also do not draw non-system windows on top of ControlsSettingsDialog Bug: 404256832 Flag: EXEMPT bugfix Test: atest ControlsSettingsDialogManagerImplTest Change-Id: I63e98794e1a93e3c208ee421654d73542d2bd34a (cherry picked from commit 0042369de2a626f462b3d0dff8db2294aa24ffec) --- .../systemui/controls/settings/ControlsSettingsDialogManager.kt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'packages/SystemUI/src') diff --git a/packages/SystemUI/src/com/android/systemui/controls/settings/ControlsSettingsDialogManager.kt b/packages/SystemUI/src/com/android/systemui/controls/settings/ControlsSettingsDialogManager.kt index 4e391b7662e3..3544bde553ff 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/settings/ControlsSettingsDialogManager.kt +++ b/packages/SystemUI/src/com/android/systemui/controls/settings/ControlsSettingsDialogManager.kt @@ -23,6 +23,7 @@ import android.content.Context.MODE_PRIVATE import android.content.DialogInterface import android.content.SharedPreferences import android.provider.Settings +import android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS import androidx.annotation.VisibleForTesting import com.android.systemui.res.R import com.android.systemui.controls.settings.ControlsSettingsDialogManager.Companion.MAX_NUMBER_ATTEMPTS_CONTROLS_DIALOG @@ -148,6 +149,8 @@ internal constructor( } } + d.window?.addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS) + SystemUIDialog.registerDismissListener(d) { dialog = null } SystemUIDialog.setDialogSize(d) SystemUIDialog.setShowForAllUsers(d, true) -- cgit v1.2.3-59-g8ed1b