diff options
4 files changed, 8 insertions, 4 deletions
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/statusbar/phone/SystemUIDialogFactoryExt.kt b/packages/SystemUI/compose/features/src/com/android/systemui/statusbar/phone/SystemUIDialogFactoryExt.kt index 5d6dd3b6bd01..23d3089d7be3 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/statusbar/phone/SystemUIDialogFactoryExt.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/statusbar/phone/SystemUIDialogFactoryExt.kt @@ -48,10 +48,11 @@ import com.android.compose.theme.PlatformTheme */ fun SystemUIDialogFactory.create( context: Context = this.applicationContext, + theme: Int = SystemUIDialog.DEFAULT_THEME, dismissOnDeviceLock: Boolean = SystemUIDialog.DEFAULT_DISMISS_ON_DEVICE_LOCK, content: @Composable (SystemUIDialog) -> Unit, ): ComponentSystemUIDialog { - val dialog = create(context, dismissOnDeviceLock) + val dialog = create(context, theme, dismissOnDeviceLock) // Create the dialog so that it is properly constructed before we set the Compose content. // Otherwise, the ComposeView won't render properly. diff --git a/packages/SystemUI/src/com/android/systemui/display/ui/view/MirroringConfirmationDialog.kt b/packages/SystemUI/src/com/android/systemui/display/ui/view/MirroringConfirmationDialog.kt index ecc9d0ef7810..f730935e1b73 100644 --- a/packages/SystemUI/src/com/android/systemui/display/ui/view/MirroringConfirmationDialog.kt +++ b/packages/SystemUI/src/com/android/systemui/display/ui/view/MirroringConfirmationDialog.kt @@ -34,7 +34,8 @@ class MirroringConfirmationDialog( context: Context, private val onStartMirroringClickListener: View.OnClickListener, private val onCancelMirroring: View.OnClickListener, -) : Dialog(context, R.style.Theme_SystemUI_Dialog) { + theme: Int = R.style.Theme_SystemUI_Dialog, +) : Dialog(context, theme) { private lateinit var mirrorButton: TextView private lateinit var dismissButton: TextView diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/backlight/ui/view/KeyboardBacklightDialog.kt b/packages/SystemUI/src/com/android/systemui/keyboard/backlight/ui/view/KeyboardBacklightDialog.kt index b5b56b2b2108..6f25f7c1921a 100644 --- a/packages/SystemUI/src/com/android/systemui/keyboard/backlight/ui/view/KeyboardBacklightDialog.kt +++ b/packages/SystemUI/src/com/android/systemui/keyboard/backlight/ui/view/KeyboardBacklightDialog.kt @@ -44,7 +44,8 @@ class KeyboardBacklightDialog( context: Context, initialCurrentLevel: Int, initialMaxLevel: Int, -) : Dialog(context, R.style.Theme_SystemUI_Dialog) { + theme: Int = R.style.Theme_SystemUI_Dialog, +) : Dialog(context, theme) { private data class RootProperties( val cornerRadius: Float, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialogFactory.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialogFactory.kt index 3b150656efc5..d91ca92747f3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialogFactory.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialogFactory.kt @@ -48,13 +48,14 @@ constructor( */ fun create( context: Context = this.applicationContext, + theme: Int = SystemUIDialog.DEFAULT_THEME, dismissOnDeviceLock: Boolean = SystemUIDialog.DEFAULT_DISMISS_ON_DEVICE_LOCK, ): ComponentSystemUIDialog { Assert.isMainThread() return ComponentSystemUIDialog( context, - SystemUIDialog.DEFAULT_THEME, + theme, dismissOnDeviceLock, featureFlags, dialogManager, |