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

Commit f9f0e876 authored by Kenneth Ford's avatar Kenneth Ford Committed by Automerger Merge Worker
Browse files

Merge "Adds content descriptions for rear display animation" into tm-qpr-dev... 

Merge "Adds content descriptions for rear display animation" into tm-qpr-dev am: 25f93401 am: a399bc26

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20669619



Change-Id: Ie2ebd92b7ccb1bb2e813a2454a692bca62a6a80b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 067ab589 a399bc26

packages/SystemUI/res/layout/activity_rear_display_education.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"

packages/SystemUI/res/layout/activity_rear_display_education_opened.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"

packages/SystemUI/res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -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>&#x2731; 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>