Merge "Fix SettingsHomepageActivity crash during configuration change" into tm-qpr-dev am: a0e5f09d94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20615154 Change-Id: I7acafe30f3cccfb2cf1428493f5cee42c5e8e9a7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -114,9 +114,14 @@ public class TopLevelHighlightMixin implements Parcelable, DialogInterface.OnSho
|
|||||||
}
|
}
|
||||||
|
|
||||||
Log.d(TAG, "onCreateAdapter, pref key: " + mCurrentKey);
|
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(
|
mTopLevelAdapter = new HighlightableTopLevelPreferenceAdapter(
|
||||||
(SettingsHomepageActivity) topLevelSettings.getActivity(), preferenceScreen,
|
(SettingsHomepageActivity) topLevelSettings.getActivity(), preferenceScreen,
|
||||||
topLevelSettings.getListView(), mCurrentKey, scrollNeeded);
|
recyclerView, mCurrentKey, scrollNeeded);
|
||||||
return mTopLevelAdapter;
|
return mTopLevelAdapter;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user