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

Commit e4a0b1b8 authored by Joshua Mokut's avatar Joshua Mokut Committed by Android (Google) Code Review
Browse files

Merge changes I99c4e734,Ief4a2a30 into main 

* changes:
  Set Header text alignment to center
  Removed unnecessary initial value when collecting StateFlow
parents e2c294fd d9b49e80

packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/ShortcutCustomizationDialogStarter.kt

+1 −4
Original line number Diff line number Diff line
@@ -88,10 +88,7 @@ constructor( 
    private fun createDialog(): Dialog {

        return dialogFactory.create(dialogDelegate = ShortcutCustomizationDialogDelegate()) { dialog

            ->

            val uiState by

                viewModel.shortcutCustomizationUiState.collectAsStateWithLifecycle(

                    initialValue = ShortcutCustomizationUiState.Inactive

                )

            val uiState by viewModel.shortcutCustomizationUiState.collectAsStateWithLifecycle()

            val coroutineScope = rememberCoroutineScope()

            ShortcutCustomizationDialog(

                uiState = uiState,

packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/composable/ShortcutCustomizer.kt

+1 −0
Original line number Diff line number Diff line
@@ -409,6 +409,7 @@ private fun Title(title: String) { 
        color = MaterialTheme.colorScheme.onSurface,

        lineHeight = 32.sp,

        fontWeight = FontWeight.W400,

        textAlign = TextAlign.Center,

    )

}