commit 8f793f5e4f892f077ab512517205fd1696028e96
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 14 03:55:49 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 14 03:55:49 2022 +0000
tree 47c2bde1f308d95b26c71784e00254f5d742a7c8
parent 677cd61616e4d26eb0113a90702fd43c5eac4f41
parent c463aee2b8c5e00397cb14e72dc9b2f33b1108b0

Merge "Fix the IllegalArgumentException from RecyclerView"

src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java

diff --git a/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java b/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java
index 9009b32..9992ae7 100644
--- a/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java
+++ b/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java
@@ -148,11 +148,11 @@
             }, DELAY_COLLAPSE_DURATION_MILLIS);
         }
 
+        // Remove the animator as early as possible to avoid a RecyclerView crash.
+        recyclerView.setItemAnimator(null);
         // Scroll to correct position after 600 milliseconds.
         root.postDelayed(() -> {
             mHighlightRequested = true;
-            // Remove the animator to avoid a RecyclerView crash.
-            recyclerView.setItemAnimator(null);
             recyclerView.smoothScrollToPosition(position);
             mHighlightPosition = position;
         }, DELAY_HIGHLIGHT_DURATION_MILLIS);