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

Commit 34b5d4c3 authored by Anton Potapov's avatar Anton Potapov
Browse files

Use platform buttons instead of directly using compose ones 

Flag: EXEMPT bugfix
Fixes: 356584953
Test: atest VolumePanelScreenshotTest
Change-Id: I573d2418aa54e020aee994d8b1e45a33ddaaaad0
parent c9a43de0

packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/bottombar/ui/BottomBarComponent.kt

+4 −12
Original line number Diff line number Diff line
@@ -20,16 +20,14 @@ import androidx.compose.foundation.layout.Arrangement 
import androidx.compose.foundation.layout.Row

import androidx.compose.foundation.layout.fillMaxWidth

import androidx.compose.foundation.layout.heightIn

import androidx.compose.material3.Button

import androidx.compose.material3.ButtonDefaults

import androidx.compose.material3.MaterialTheme

import androidx.compose.material3.OutlinedButton

import androidx.compose.material3.Text

import androidx.compose.runtime.Composable

import androidx.compose.ui.Alignment

import androidx.compose.ui.Modifier

import androidx.compose.ui.res.stringResource

import androidx.compose.ui.unit.dp

import com.android.compose.PlatformButton

import com.android.compose.PlatformOutlinedButton

import com.android.systemui.res.R

import com.android.systemui.volume.panel.component.bottombar.ui.viewmodel.BottomBarViewModel

import com.android.systemui.volume.panel.dagger.scope.VolumePanelScope
@@ -51,16 +49,10 @@ constructor( 
            horizontalArrangement = Arrangement.SpaceBetween,

            verticalAlignment = Alignment.CenterVertically,

        ) {

            OutlinedButton(

                onClick = viewModel::onSettingsClicked,

                colors =

                    ButtonDefaults.outlinedButtonColors(

                        contentColor = MaterialTheme.colorScheme.onSurface,

                    ),

            ) {

            PlatformOutlinedButton(onClick = viewModel::onSettingsClicked) {

                Text(text = stringResource(R.string.volume_panel_dialog_settings_button))

            }

            Button(onClick = viewModel::onDoneClicked) {

            PlatformButton(onClick = viewModel::onDoneClicked) {

                Text(stringResource(R.string.inline_done_button))

            }

        }