From 1b6ab7ec90f67a2d1d254779bddb870022ddf2cb Mon Sep 17 00:00:00 2001 From: Weiyue Huang Date: Tue, 21 Feb 2023 14:14:14 +0800 Subject: [PATCH 1/2] Prevent the screen reader box from unexpected scrolling in dream setting page. Bug: 228355186 Test: manual Change-Id: I66a70d6b12bd3a2766e6879cb27c68a851d1dd87 Merged-In: I66a70d6b12bd3a2766e6879cb27c68a851d1dd87 (cherry picked from commit edfd262be29fd9f1de5750145bf7b3f08adc7adc) --- src/com/android/settings/dream/DreamSettings.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/com/android/settings/dream/DreamSettings.java b/src/com/android/settings/dream/DreamSettings.java index acc69731d0d..99fcfb9fd3a 100644 --- a/src/com/android/settings/dream/DreamSettings.java +++ b/src/com/android/settings/dream/DreamSettings.java @@ -195,6 +195,10 @@ public class DreamSettings extends DashboardFragment implements OnMainSwitchChan mPreviewButton.setOnClickListener(v -> dreamBackend.preview(dreamBackend.getActiveDream())); mRecyclerView = super.onCreateRecyclerView(inflater, parent, bundle); + // The enable/disable status change of the nested RecyclerView(Dream Picker) causes the + // focus moving. Make the RecyclerView unfocusable to prevent the unexpected scrolling when + // the focus changes in the TalkBack mode. + mRecyclerView.setFocusable(false); updatePaddingForPreviewButton(); return mRecyclerView; } From 796fcccd9b9790dbc0598de6b4b8128806a89553 Mon Sep 17 00:00:00 2001 From: menghanli Date: Thu, 16 Mar 2023 07:31:02 +0800 Subject: [PATCH 2/2] Update color-check-baseline.xml (Fixed according to the instructions in prebuilts/checkcolor/README.md) Bug: 273556105 Test: repo upload checks Change-Id: Iaf4ab9f6cc1c836348226bc36358cbb73d2583d2 Merged-In: Ife355166df080ce7371a95b5cea28575227153f0 --- color-check-baseline.xml | 1366 +++++++++++++++++++++++--------------- 1 file changed, 827 insertions(+), 539 deletions(-) diff --git a/color-check-baseline.xml b/color-check-baseline.xml index 3eb307eafdc..4926e04c76e 100644 --- a/color-check-baseline.xml +++ b/color-check-baseline.xml @@ -13,6 +13,646 @@ file="."/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + errorLine1=" <color name="sfps_enrollment_fp_error_color">#fad2cf</color> <!-- Red 100 -->" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - - - - - - - - - - - - - - - - @@ -765,6 +1277,22 @@ column="5"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + @@ -4581,11 +4933,11 @@ priority="4" summary="Using hardcoded color" explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes. This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app." - errorLine1=" <string name="sync_plug" msgid="7956982719077985381"><font fgcolor="#ffffffff">"Welcome to Google sync!"</font>" \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are."</string>" + errorLine1=" <string name="sync_plug" msgid="7956982719077985381"><font fgcolor="#ffffffff">"Welcome to Google sync!"</font>" \nA Google approach to syncing data to allow access to your contacts, appointments, and more from wherever you are."</string>" errorLine2=" ~~~~~~~~~~~~~~~~~~~"> @@ -4601,7 +4953,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~"> @@ -4617,7 +4969,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~"> @@ -4633,7 +4985,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~"> @@ -4649,7 +5001,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~"> @@ -4989,38 +5341,6 @@ column="45"/> - - - - - - - - - - - - - - - -