From 039868e454534874616ea2467a719b5be5cd78ea Mon Sep 17 00:00:00 2001
From: Lucas Silva <lusilva@google.com>
Date: Tue, 15 Feb 2022 18:03:35 +0000
Subject: [PATCH 1/2] Update dream settings strings to match latest UX mocks

Bug: 213906361
Test: locally on device
Change-Id: I8eb5047d1aeb74c1e2da60d730e94ba732367846
---
 res/values/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 40e0008804e..c4f75d1945c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -13905,13 +13905,13 @@
     <!-- TARE dialog button to proceed with a value change [CHAR LIMIT=none] -->
     <string name="tare_dialog_confirm_button_title">Confirm</string>
     <!-- Button to preview the selected screensaver in settings [CHAR LIMIT=40] -->
-    <string name="dream_preview_button_title">Preview screen saver</string>
+    <string name="dream_preview_button_title">Preview</string>
     <!-- The title of the category to show for the screensaver selector in settings [CHAR LIMIT=none] -->
-    <string name="dream_picker_category">Choose a background</string>
+    <string name="dream_picker_category">Choose a screen saver</string>
     <!-- The title of the toggle which enables/disables overlays on top of the screen saver [CHAR LIMIT=none] -->
     <string name="dream_complications_toggle_title">Show additional information</string>
     <!-- The summary of what overlays this toggle controls [CHAR LIMIT=none] -->
-    <string name="dream_complications_toggle_summary">Display data time, date and weather on the screen saver</string>
+    <string name="dream_complications_toggle_summary">Display time, date and weather on the screen saver</string>
     <!-- The title of the category to show for the screensaver miscellaneous settings [CHAR LIMIT=none] -->
     <string name="dream_more_settings_category">More settings</string>
     <!-- The title of the screen saver setup page [CHAR LIMIT=none] -->

From 9b3026588049afc343b1139c41c5379f2c1c1007 Mon Sep 17 00:00:00 2001
From: Lucas Silva <lusilva@google.com>
Date: Tue, 15 Feb 2022 19:04:23 +0000
Subject: [PATCH 2/2] Add accessibility annotations to dream settings.

Tooling should ignore the preview images, since the dream name and
summary is already specified as text views.

Test: locally on device, with Talkback
Bug: 213906361
Change-Id: I49f4b5d677d2645655e575764fb990de2e49fb59
---
 res/layout/dream_preference_layout.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/res/layout/dream_preference_layout.xml b/res/layout/dream_preference_layout.xml
index 9528f4d91d8..abb2a34d922 100644
--- a/res/layout/dream_preference_layout.xml
+++ b/res/layout/dream_preference_layout.xml
@@ -34,6 +34,7 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:background="@drawable/dream_preview_rounded_bg"
+            android:importantForAccessibility="no"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -44,6 +45,7 @@
             android:layout_width="@dimen/dream_preview_placeholder_width"
             android:layout_height="0dp"
             android:src="@drawable/dream_default_preview_icon"
+            android:importantForAccessibility="no"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintTop_toTopOf="@+id/preview"
             app:layout_constraintBottom_toBottomOf="@+id/preview"
@@ -70,6 +72,7 @@
             android:layout_marginStart="@dimen/dream_item_icon_margin_start"
             android:layout_marginBottom="@dimen/dream_item_title_margin_bottom"
             android:gravity="center_vertical"
+            android:importantForAccessibility="no"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintTop_toBottomOf="@+id/preview"