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

Commit 25f93401 authored by Kenneth Ford's avatar Kenneth Ford Committed by Android (Google) Code Review
Browse files

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

parents a90ccc44 fb54cadf

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
@@ -2755,4 +2755,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>