From 1b6ab7ec90f67a2d1d254779bddb870022ddf2cb Mon Sep 17 00:00:00 2001
From: Weiyue Huang <hwy@google.com>
Date: Tue, 21 Feb 2023 14:14:14 +0800
Subject: [PATCH] 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;
     }