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

Commit 69643009 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "Add a11y content descriptions and label mapping to Dreams." into jb-mr1-dev

parents 2fa8cf73 364082e3
Loading
Loading
Loading
Loading
+6 −3
Original line number Diff line number Diff line
@@ -54,7 +54,8 @@
            android:ellipsize="end"
            android:singleLine="true"
            android:textAppearance="?android:attr/textAppearanceMedium"
            android:textDirection="locale" />
            android:textDirection="locale"
            android:labelFor="@android:id/button2" />

        <!-- Dream radio button -->

@@ -64,7 +65,9 @@
            android:layout_height="match_parent"
            android:layout_alignParentEnd="true"
            android:layout_centerVertical="true"
            android:duplicateParentState="true" />
            android:duplicateParentState="true"
            android:clickable="false"
            android:focusable="false" />
    </RelativeLayout>

    <!-- Divider -->
@@ -90,7 +93,7 @@
        android:layout_centerVertical="true"
        android:layout_margin="0dip"
        android:background="?android:attr/selectableItemBackground"
        android:contentDescription="@null"
        android:contentDescription="@string/screensaver_settings_button"
        android:padding="8dip"
        android:src="@drawable/ic_bt_config" />

+2 −0
Original line number Diff line number Diff line
@@ -1793,6 +1793,8 @@
    <string name="screensaver_settings_when_to_dream">When to sleep</string>
    <!-- Dream settings screen, button label to start dreaming -->
    <string name="screensaver_settings_dream_start">Sleep now</string>
    <!-- Dream settings screen, button label for settings for a specific screensaver -->
    <string name="screensaver_settings_button">Settings</string>
    <!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions -->
    <string name="automatic_brightness">Automatic brightness</string>
    <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->