Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev
diff --git a/src/com/android/settings/dream/DreamSettings.java b/src/com/android/settings/dream/DreamSettings.java
index df50a08..824aa15 100644
--- a/src/com/android/settings/dream/DreamSettings.java
+++ b/src/com/android/settings/dream/DreamSettings.java
@@ -224,6 +224,10 @@
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;
}