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

Commit 295f1852 authored by Anton Potapov's avatar Anton Potapov Committed by Android (Google) Code Review
Browse files

Merge "Remove button padding value for the icon to work with the max display scale" into main

parents 3559a202 12dc6012

packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/button/ui/composable/ToggleButtonComponent.kt

+3 −1
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui.volume.panel.component.button.ui.composable 
import androidx.compose.foundation.basicMarquee

import androidx.compose.foundation.basicMarquee

import androidx.compose.foundation.layout.Arrangement

import androidx.compose.foundation.layout.Arrangement

import androidx.compose.foundation.layout.Column

import androidx.compose.foundation.layout.Column

import androidx.compose.foundation.layout.PaddingValues

import androidx.compose.foundation.layout.fillMaxSize

import androidx.compose.foundation.layout.fillMaxSize

import androidx.compose.foundation.layout.padding

import androidx.compose.foundation.layout.padding

import androidx.compose.foundation.layout.size

import androidx.compose.foundation.layout.size
@@ -91,7 +92,8 @@ class ToggleButtonComponent( 
                        },

                        },

                    onClick = { onCheckedChange(!viewModel.isActive) },

                    onClick = { onCheckedChange(!viewModel.isActive) },

                    shape = RoundedCornerShape(28.dp),

                    shape = RoundedCornerShape(28.dp),

                    colors = colors

                    colors = colors,

                    contentPadding = PaddingValues(0.dp)

                ) {

                ) {

                    Icon(modifier = Modifier.size(24.dp), icon = viewModel.icon)

                    Icon(modifier = Modifier.size(24.dp), icon = viewModel.icon)

                }

                }