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

Commit 78ca47e6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "QS add missing modifier parameter/usages" into main

parents a9f6993e 15067518

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

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ constructor( 
            snapshotFlow { pagerState.currentPage == 0 }.collect { viewModel.inFirstPage = it }

        }



        Column {

        Column(modifier) {

            val contentPaddingValue =

                if (pages.size > 1) {

                    InterPageSpacing

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

+2 −1
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ import com.android.systemui.qs.panels.ui.viewmodel.TileViewModel 
import com.android.systemui.qs.pipeline.shared.TileSpec

import com.android.systemui.qs.shared.ui.ElementKeys.toElementKey

import com.android.systemui.res.R

import javax.inject.Inject

import kotlinx.coroutines.launch

import javax.inject.Inject



@SysUISingleton

class InfiniteGridLayout
@@ -111,6 +111,7 @@ constructor( 
            rowSpacing = dimensionResource(R.dimen.qs_tile_margin_vertical),

            spans = spans,

            keys = { sizedTiles[it].tile.spec },

            modifier = modifier,

        ) { spanIndex, column, isFirstInColumn, isLastInColumn ->

            val it = sizedTiles[spanIndex]

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

+3 −1
Original line number Diff line number Diff line
@@ -314,11 +314,13 @@ fun TileContainer( 
    accessibilityUiState: AccessibilityUiState,

    iconOnly: Boolean,

    isDualTarget: Boolean,

    modifier: Modifier = Modifier,

    content: @Composable BoxScope.() -> Unit,

) {

    Box(

        modifier =

            Modifier.height(TileHeight)

            modifier

                .height(TileHeight)

                .fillMaxWidth()

                .tileCombinedClickable(

                    onClick = onClick ?: {},