commit 410c1d28bfd3c386f9d64677f8383d4135a9ed6f
author Yi Jiang <eejiang@google.com> Tue Dec 13 16:27:35 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 13 16:27:35 2022 +0000
tree 39c12e66072d98d63753855ed2aa833c5e939b36
parent a0e5f09d94f510638b2af0740c2af66ee554661c
parent 1145b26ac72eb094dc0d810bb608d67b2b12ac08

Merge "Creates a flag for auto-rotate with face detection" into tm-qpr-dev

src/com/android/settings/homepage/TopLevelHighlightMixin.java

diff --git a/src/com/android/settings/homepage/TopLevelHighlightMixin.java b/src/com/android/settings/homepage/TopLevelHighlightMixin.java
index 4718443..db099cb 100644
--- a/src/com/android/settings/homepage/TopLevelHighlightMixin.java
+++ b/src/com/android/settings/homepage/TopLevelHighlightMixin.java
@@ -114,9 +114,14 @@
         }
 
         Log.d(TAG, "onCreateAdapter, pref key: " + mCurrentKey);
+
+        // Remove the animator to avoid a RecyclerView crash.
+        RecyclerView recyclerView = topLevelSettings.getListView();
+        recyclerView.setItemAnimator(null);
+
         mTopLevelAdapter = new HighlightableTopLevelPreferenceAdapter(
                 (SettingsHomepageActivity) topLevelSettings.getActivity(), preferenceScreen,
-                topLevelSettings.getListView(), mCurrentKey, scrollNeeded);
+                recyclerView, mCurrentKey, scrollNeeded);
         return mTopLevelAdapter;
     }