Merge "Simplify some of the logic." into oc-dev am: d8b5621640 am: 41ce373022
am: 660851ca35
Change-Id: I3421f8855d92bf17ca5ca892289bfa974b3b9b64
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 dba01c9..41fb79a 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,8 +31,7 @@
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:importantForAccessibility="no"/>
+ android:background="@drawable/settings_watch_face_preview_background"/>
<View
android:id="@+id/watch_face_highlight"
@@ -40,8 +39,7 @@
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:importantForAccessibility="no"/>
+ android:background="@drawable/settings_watch_face_preview_highlight"/>
<View
@@ -50,8 +48,7 @@
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:importantForAccessibility="no"/>
+ android:background="@drawable/settings_watch_face_preview_arms_and_ticks"/>
<ImageView
@@ -62,8 +59,7 @@
android:layout_centerVertical="true"
android:src="@drawable/added_complication"
style="?android:borderlessButtonStyle"
- android:background="@android:color/transparent"
- android:importantForAccessibility="no" />
+ android:background="@android:color/transparent"/>
<ImageButton
android:id="@+id/left_complication"
@@ -82,8 +78,7 @@
android:layout_centerVertical="true"
android:src="@drawable/added_complication"
style="?android:borderlessButtonStyle"
- android:background="@android:color/transparent"
- android:importantForAccessibility="no"/>
+ android:background="@android:color/transparent"/>
<ImageButton
android:id="@+id/right_complication"
@@ -93,4 +88,4 @@
android:layout_centerVertical="true"
style="?android:borderlessButtonStyle"
android:background="@android:color/transparent"/>
-</RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
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 8dbaccc..45f3186 100644
--- a/wearable/wear/WatchFace/Wearable/src/main/res/values/strings.xml
+++ b/wearable/wear/WatchFace/Wearable/src/main/res/values/strings.xml
@@ -26,6 +26,7 @@
<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>
@@ -47,8 +48,7 @@
<string name="color_navy">Navy</string>
<string name="color_red">Red</string>
<string name="color_white">White</string>
-
- <string name="analog_complication_config">Configure Watchface Complications</string>
+ <string name="analog_complication_config">Analog Complication Config</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>
