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

Commit e8e08726 authored by Ram Peri's avatar Ram Peri Committed by Android (Google) Code Review
Browse files

Merge "Fix the values of Material You colors in Screenshot test theme (2/2)" into main

parents a4290cd6 aff7ce66

packages/SystemUI/compose/features/src/com/android/systemui/statusbar/phone/SystemUIDialogFactoryExt.kt

+2 −1
Original line number Diff line number Diff line
@@ -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.

packages/SystemUI/src/com/android/systemui/display/ui/view/MirroringConfirmationDialog.kt

+2 −1
Original line number Diff line number Diff line
@@ -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

packages/SystemUI/src/com/android/systemui/keyboard/backlight/ui/view/KeyboardBacklightDialog.kt

+2 −1
Original line number Diff line number Diff line
@@ -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,

packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialogFactory.kt

+2 −1
Original line number Diff line number Diff line
@@ -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,