diff options
| author | Tyler Freeman <fuego@google.com> | 2017-10-07 00:50:16 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-07 00:50:16 +0000 |
| commit | 405f2516aca224e286dba46b4b546f5f10223675 (patch) | |
| tree | dbe04e10ba5129863dc38a9424ce30bdd4639a0b | |
| parent | 2c974e0bf1c5e1a1ee66f5d4c429b06a29d463ba (diff) | |
| parent | 671a1871c76a8459ce7647a7dcd7e1ba58d31e5e (diff) | |
| download | android-405f2516aca224e286dba46b4b546f5f10223675.tar.gz | |
DO NOT MERGE Watchface sample: Accessibility: Fixed "unlabeled button" on linear navigation.
am: 671a1871c7
Change-Id: I5edb8320260824fcf91512ac8913f86198b3ea61
| -rw-r--r-- | wearable/wear/WatchFace/Wearable/src/main/res/layout/config_list_preview_and_complications_item.xml | 17 | ||||
| -rw-r--r-- | wearable/wear/WatchFace/Wearable/src/main/res/values/strings.xml | 4 |
2 files changed, 13 insertions, 8 deletions
diff --git a/wearable/wear/WatchFace/Wearable/src/main/res/layout/config_list_preview_and_complications_item.xml b/wearable/wear/WatchFace/Wearable/src/main/res/layout/config_list_preview_and_complications_item.xml index 41fb79ae..dba01c9a 100644 --- a/wearable/wear/WatchFace/Wearable/src/main/res/layout/config_list_preview_and_complications_item.xml +++ b/wearable/wear/WatchFace/Wearable/src/main/res/layout/config_list_preview_and_complications_item.xml @@ -31,7 +31,8 @@ based on changes by the user. android:layout_height="@dimen/analog_complication_settings_preview_size" android:layout_centerHorizontal="true" android:layout_centerVertical="true" - android:background="@drawable/settings_watch_face_preview_background"/> + android:background="@drawable/settings_watch_face_preview_background" + android:importantForAccessibility="no"/> <View android:id="@+id/watch_face_highlight" @@ -39,7 +40,8 @@ based on changes by the user. android:layout_height="@dimen/analog_complication_settings_preview_size" android:layout_centerHorizontal="true" android:layout_centerVertical="true" - android:background="@drawable/settings_watch_face_preview_highlight"/> + android:background="@drawable/settings_watch_face_preview_highlight" + android:importantForAccessibility="no"/> <View @@ -48,7 +50,8 @@ based on changes by the user. android:layout_height="@dimen/analog_complication_settings_preview_size" android:layout_centerHorizontal="true" android:layout_centerVertical="true" - android:background="@drawable/settings_watch_face_preview_arms_and_ticks"/> + android:background="@drawable/settings_watch_face_preview_arms_and_ticks" + android:importantForAccessibility="no"/> <ImageView @@ -59,7 +62,8 @@ based on changes by the user. android:layout_centerVertical="true" android:src="@drawable/added_complication" style="?android:borderlessButtonStyle" - android:background="@android:color/transparent"/> + android:background="@android:color/transparent" + android:importantForAccessibility="no" /> <ImageButton android:id="@+id/left_complication" @@ -78,7 +82,8 @@ based on changes by the user. android:layout_centerVertical="true" android:src="@drawable/added_complication" style="?android:borderlessButtonStyle" - android:background="@android:color/transparent"/> + android:background="@android:color/transparent" + android:importantForAccessibility="no"/> <ImageButton android:id="@+id/right_complication" @@ -88,4 +93,4 @@ based on changes by the user. android:layout_centerVertical="true" style="?android:borderlessButtonStyle" android:background="@android:color/transparent"/> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/wearable/wear/WatchFace/Wearable/src/main/res/values/strings.xml b/wearable/wear/WatchFace/Wearable/src/main/res/values/strings.xml index 45f31867..8dbacccc 100644 --- a/wearable/wear/WatchFace/Wearable/src/main/res/values/strings.xml +++ b/wearable/wear/WatchFace/Wearable/src/main/res/values/strings.xml @@ -26,7 +26,6 @@ <string name="digital_am">AM</string> <string name="digital_pm">PM</string> - <string name="analog_complication_config_name">Configuration</string> <string name="complications_provider_incrementing_number">Incrementing Number</string> <string name="analog_complication_preference_file_key">com.example.android.wearable.watchface.ANALOG_COMPLICATION_PREFERENCE_FILE_KEY</string> @@ -48,7 +47,8 @@ <string name="color_navy">Navy</string> <string name="color_red">Red</string> <string name="color_white">White</string> - <string name="analog_complication_config">Analog Complication Config</string> + + <string name="analog_complication_config">Configure Watchface Complications</string> <string name="add_complication">Add Complication</string> <string name="edit_complication">Edit Complication <xliff:g id="name" example="World Clock">%1$s</xliff:g></string> |