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

Commit 7f1e37fc authored by Michal Brzezinski's avatar Michal Brzezinski
Browse files

Disabling button when not visible 

Currently button can still be clicked even if it's not visible

Fixes: 376063732
Test: manual
Flag: com.android.systemui.shared.new_touchpad_gestures_tutorial
Change-Id: I66a24031fed15ba7dbc5e3867e87bef53721d21f
parent af925a58

packages/SystemUI/src/com/android/systemui/inputdevice/tutorial/ui/composable/ActionTutorialContent.kt

+5 −1
Original line number Diff line number Diff line
@@ -77,7 +77,11 @@ fun ActionTutorialContent( 
            }

        }

        val buttonAlpha by animateFloatAsState(if (actionState is Finished) 1f else 0f)

        DoneButton(onDoneButtonClicked, Modifier.graphicsLayer { alpha = buttonAlpha })

        DoneButton(

            onDoneButtonClicked = onDoneButtonClicked,

            modifier = Modifier.graphicsLayer { alpha = buttonAlpha },

            enabled = actionState is Finished,

        )

    }

}

packages/SystemUI/src/com/android/systemui/inputdevice/tutorial/ui/composable/TutorialComponents.kt

+7 −3
Original line number Diff line number Diff line
@@ -28,13 +28,17 @@ import androidx.compose.ui.res.stringResource 
import com.android.systemui.res.R



@Composable

fun DoneButton(onDoneButtonClicked: () -> Unit, modifier: Modifier = Modifier) {

fun DoneButton(

    onDoneButtonClicked: () -> Unit,

    modifier: Modifier = Modifier,

    enabled: Boolean = true,

) {

    Row(

        horizontalArrangement = Arrangement.End,

        verticalAlignment = Alignment.CenterVertically,

        modifier = modifier.fillMaxWidth()

        modifier = modifier.fillMaxWidth(),

    ) {

        Button(onClick = onDoneButtonClicked) {

        Button(onClick = onDoneButtonClicked, enabled = enabled) {

            Text(stringResource(R.string.touchpad_tutorial_done_button))

        }

    }