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

Commit e96bf23b authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Provide content label for splash screen view." into sc-dev am: 0b31d206 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie804f6e8e19de70d72f07175ed54557c43f8bf58
parents 49a6e505 0b31d206

core/res/res/layout/splash_screen_view.xml

+6 −4
Original line number Diff line number Diff line
@@ -23,12 +23,14 @@ 
    <View android:id="@+id/splashscreen_icon_view"

          android:layout_height="wrap_content"

          android:layout_width="wrap_content"

    android:layout_gravity="center"/>

          android:layout_gravity="center"

          android:contentDescription="@string/splash_screen_view_icon_description"/>



    <View android:id="@+id/splashscreen_branding_view"

          android:layout_height="wrap_content"

          android:layout_width="wrap_content"

          android:layout_gravity="center_horizontal|bottom"

          android:layout_marginBottom="60dp"/>

          android:layout_marginBottom="60dp"

          android:contentDescription="@string/splash_screen_view_branding_description"/>



</android.window.SplashScreenView>
 
 No newline at end of file

core/res/res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -5849,4 +5849,8 @@ ul.</string> 
    <!--- Label for notification channel for all sensor privacy related notifications. [CHAR LIMIT=NONE] -->

    <string name="sensor_privacy_notification_channel_label">Sensor Privacy</string>



    <!-- Content description for the icon on the splash screen. [CHAR LIMIT=50] -->

    <string name="splash_screen_view_icon_description">Application icon</string>

    <!-- Content description for the branding image on the splash screen. [CHAR LIMIT=50] -->

    <string name="splash_screen_view_branding_description">Application branding image</string>

</resources>