diff options
| author | 2022-12-09 20:10:49 +0000 | |
|---|---|---|
| committer | 2022-12-09 20:10:49 +0000 | |
| commit | f9f0e876241d1b294ac68f21ce7792718cf3f025 (patch) | |
| tree | 4f15a88d6e42c7d3bbec998989a6141d6233ee31 | |
| parent | 067ab5895e88995b0cb95bfa098f69b638f89133 (diff) | |
| parent | a399bc2630b170842047653f8d098ef9e1faf7e6 (diff) | |
Merge "Adds content descriptions for rear display animation" into tm-qpr-dev am: 25f934011d am: a399bc2630
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20669619
Change-Id: Ie2ebd92b7ccb1bb2e813a2454a692bca62a6a80b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
3 files changed, 6 insertions, 2 deletions
diff --git a/packages/SystemUI/res/layout/activity_rear_display_education.xml b/packages/SystemUI/res/layout/activity_rear_display_education.xml index 73d3f0236fff..f5fc48c70003 100644 --- a/packages/SystemUI/res/layout/activity_rear_display_education.xml +++ b/packages/SystemUI/res/layout/activity_rear_display_education.xml @@ -33,7 +33,7 @@ android:layout_width="@dimen/rear_display_animation_width" android:layout_height="@dimen/rear_display_animation_height" android:layout_gravity="center" - android:contentDescription="@null" + android:contentDescription="@string/rear_display_accessibility_folded_animation" android:scaleType="fitXY" app:lottie_rawRes="@raw/rear_display_folded" app:lottie_autoPlay="true" diff --git a/packages/SystemUI/res/layout/activity_rear_display_education_opened.xml b/packages/SystemUI/res/layout/activity_rear_display_education_opened.xml index 20b93d9bc40d..6de06f76ebbf 100644 --- a/packages/SystemUI/res/layout/activity_rear_display_education_opened.xml +++ b/packages/SystemUI/res/layout/activity_rear_display_education_opened.xml @@ -34,7 +34,7 @@ android:layout_width="@dimen/rear_display_animation_width" android:layout_height="@dimen/rear_display_animation_height" android:layout_gravity="center" - android:contentDescription="@null" + android:contentDescription="@string/rear_display_accessibility_unfolded_animation" android:scaleType="fitXY" app:lottie_rawRes="@raw/rear_display_turnaround" app:lottie_autoPlay="true" diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 88ed50e35352..5d4fa58cfcd1 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -2874,4 +2874,8 @@ <string name="rear_display_bottom_sheet_description">Use the rear-facing camera for a wider photo with higher resolution.</string> <!-- Text for education page description to warn user that the display will turn off if the button is clicked. [CHAR_LIMIT=NONE] --> <string name="rear_display_bottom_sheet_warning"><b>✱ This screen will turn off</b></string> + <!-- Text for education page content description for folded animation. [CHAR_LIMIT=NONE] --> + <string name="rear_display_accessibility_folded_animation">Foldable device being unfolded</string> + <!-- Text for education page content description for unfolded animation. [CHAR_LIMIT=NONE] --> + <string name="rear_display_accessibility_unfolded_animation">Foldable device being flipped around</string> </resources> |