Merge "Fix SettingsHomepageActivity crash during configuration change" into tm-qpr-dev am: a0e5f09d94 am: a538747a6a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20615154

Change-Id: Id0b95aa046f8b225d75bedd0ff752f8f1b0b78d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Arc Wang
2022-12-13 02:45:16 +00:00
committed by Automerger Merge Worker

View File

@@ -116,9 +116,14 @@ public class TopLevelHighlightMixin implements Parcelable, DialogInterface.OnSho
}
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;
}