From f0ee9f1e59cf8b01b79d0ef5362fefcd22b7bb68 Mon Sep 17 00:00:00 2001 From: Pat Manning Date: Tue, 3 Dec 2024 17:42:16 +0000 Subject: Add content description to OOBE tutorial animation. Fix: 381487485 Test: Manual. Talkback. Flag: EXEMPT Bugfix. Change-Id: I1bec9193d99e1a73e553d703d2d7d489227dacc2 --- packages/SystemUI/res/values/strings.xml | 2 ++ .../inputdevice/tutorial/ui/composable/TutorialAnimation.kt | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index e417da4d8815..d18e1d7b50f5 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -3949,6 +3949,8 @@ Well done! You completed the view all apps gesture + + Tutorial animation, click to pause and resume play. Keyboard backlight diff --git a/packages/SystemUI/src/com/android/systemui/inputdevice/tutorial/ui/composable/TutorialAnimation.kt b/packages/SystemUI/src/com/android/systemui/inputdevice/tutorial/ui/composable/TutorialAnimation.kt index abd39cc8dea8..ad18817704aa 100644 --- a/packages/SystemUI/src/com/android/systemui/inputdevice/tutorial/ui/composable/TutorialAnimation.kt +++ b/packages/SystemUI/src/com/android/systemui/inputdevice/tutorial/ui/composable/TutorialAnimation.kt @@ -36,6 +36,9 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.node.Ref +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics import androidx.compose.ui.util.lerp import com.airbnb.lottie.LottieComposition import com.airbnb.lottie.compose.LottieAnimation @@ -47,6 +50,7 @@ import com.airbnb.lottie.compose.rememberLottieComposition import com.android.systemui.inputdevice.tutorial.ui.composable.TutorialActionState.Finished import com.android.systemui.inputdevice.tutorial.ui.composable.TutorialActionState.InProgress import com.android.systemui.inputdevice.tutorial.ui.composable.TutorialActionState.NotStarted +import com.android.systemui.res.R @Composable fun TutorialAnimation( @@ -104,11 +108,15 @@ private fun EducationAnimation( isPlaying = isPlaying, restartOnPlay = false, ) + val animationDescription = stringResource(R.string.tutorial_animation_content_description) LottieAnimation( composition = composition, progress = { progress }, dynamicProperties = animationProperties, - modifier = Modifier.fillMaxSize().clickable { isPlaying = !isPlaying }, + modifier = + Modifier.fillMaxSize() + .clickable { isPlaying = !isPlaying } + .semantics { contentDescription = animationDescription }, ) } -- cgit v1.2.3-59-g8ed1b