diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2012-10-03 13:05:06 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-03 13:05:06 -0700 |
| commit | 69643009a663bdd64b4fbe7a08c4c7a2111d2207 (patch) | |
| tree | 264fb779be2cc732850595ec641a9dac97f5023b | |
| parent | 2fa8cf7360c7c1ad309fe878355426a6e161af5b (diff) | |
| parent | 364082e355e0ea4f39e48d8ef11b18350f4b077e (diff) | |
| download | packages_apps_settings-69643009a663bdd64b4fbe7a08c4c7a2111d2207.zip packages_apps_settings-69643009a663bdd64b4fbe7a08c4c7a2111d2207.tar.gz packages_apps_settings-69643009a663bdd64b4fbe7a08c4c7a2111d2207.tar.bz2 | |
Merge "Add a11y content descriptions and label mapping to Dreams." into jb-mr1-dev
| -rw-r--r-- | res/layout/dream_info_row.xml | 9 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/res/layout/dream_info_row.xml b/res/layout/dream_info_row.xml index c2d90fb..a2f81c6 100644 --- a/res/layout/dream_info_row.xml +++ b/res/layout/dream_info_row.xml @@ -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" /> diff --git a/res/values/strings.xml b/res/values/strings.xml index 0d2a983..1f94287 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -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 --> |