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

Commit 4f1407d3 authored by Fabián Kozynski's avatar Fabián Kozynski
Browse files

Remove WindowInsets in TopAppBar 

TopAppBar in edit mode was applying window insets even when the
Scaffold didn't expand to the top edge. Instead, set them to 0 and do
the same as for the other QS scenes (pass the known padding from the
viewmodel).

Test: manual, landscape, unfolded
Fixes: 396632343
Flag: com.android.systemui.qs_ui_refactor_compose_fragment
Change-Id: Ie025734c26be3f1613a6925884466578cc7a06aa
parent 4d9fc173

packages/SystemUI/src/com/android/systemui/qs/composefragment/QSFragmentCompose.kt

+2 −1
Original line number Diff line number Diff line
@@ -852,7 +852,8 @@ constructor( 
            modifier =

                modifier

                    .fillMaxWidth()

                    .padding(horizontal = { QuickSettingsShade.Dimensions.Padding.roundToPx() }),

                    .padding(horizontal = { QuickSettingsShade.Dimensions.Padding.roundToPx() })

                    .padding(top = { viewModel.qqsHeaderHeight }),

        )

    }

packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/EditTile.kt

+5 −2
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ import androidx.compose.foundation.layout.heightIn 
import androidx.compose.foundation.layout.padding

import androidx.compose.foundation.layout.requiredHeightIn

import androidx.compose.foundation.layout.size

import androidx.compose.foundation.layout.statusBarsPadding

import androidx.compose.foundation.layout.systemBars

import androidx.compose.foundation.layout.windowInsetsBottomHeight

import androidx.compose.foundation.layout.wrapContentHeight
@@ -188,6 +189,7 @@ object TileType 
@Composable

private fun EditModeTopBar(

    onStopEditing: () -> Unit,

    modifier: Modifier = Modifier,

    actions: @Composable RowScope.() -> Unit = {},

) {

    val surfaceEffect2 = LocalAndroidColorScheme.current.surfaceEffect2
@@ -218,7 +220,8 @@ private fun EditModeTopBar( 
            }

        },

        actions = actions,

        modifier = Modifier.padding(vertical = 8.dp),

        modifier = modifier.padding(vertical = 8.dp),

        windowInsets = WindowInsets(0.dp),

    )

}
@@ -259,7 +262,7 @@ fun DefaultEditTileGrid( 
    Scaffold(

        containerColor = Color.Transparent,

        topBar = {

            EditModeTopBar(onStopEditing = onStopEditing) {

            EditModeTopBar(onStopEditing = onStopEditing, modifier = Modifier.statusBarsPadding()) {

                AnimatedVisibility(snapshotViewModel.canUndo, enter = fadeIn(), exit = fadeOut()) {

                    TextButton(

                        enabled = snapshotViewModel.canUndo,