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

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

Merge "[Media] Secondary action buttons can be disabled." into main

parents c6d1d7f3 2a60ecc2

packages/SystemUI/src/com/android/systemui/media/remedia/ui/compose/Media.kt

+1 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ private fun SecondaryActionContent( 
        iconResource = (viewModel.icon as Icon.Resource).res,

        contentDescription = viewModel.icon.contentDescription?.load(),

        colors = IconButtonDefaults.iconButtonColors(contentColor = iconColor),

        enabled = viewModel.isEnabled,

        modifier = modifier.size(48.dp).padding(13.dp),

    )

}

packages/SystemUI/src/com/android/systemui/media/remedia/ui/viewmodel/MediaSecondaryActionViewModel.kt

+5 −1
Original line number Diff line number Diff line
@@ -19,4 +19,8 @@ package com.android.systemui.media.remedia.ui.viewmodel 
import com.android.systemui.common.shared.model.Icon



/** Models UI state for a secondary action button within media controls. */

data class MediaSecondaryActionViewModel(val icon: Icon, val onClick: () -> Unit)
 
data class MediaSecondaryActionViewModel(

    val icon: Icon,

    val isEnabled: Boolean,

    val onClick: () -> Unit,

)