Merge remote-tracking branch 'origin/lineage-23.2' into a16.2 (ad20c1c4) · Commits · e / os / android_frameworks_base

packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsBasePreferenceFragment.kt

+7 −5

Original line number	Diff line number	Diff line
		@@ -36,17 +36,19 @@ abstract class SettingsBasePreferenceFragment : PreferenceFragmentCompat() {
		container: ViewGroup?,
		savedInstanceState: Bundle?
		): View {
		return super.onCreateView(inflater, container, savedInstanceState)
		}
		val view = super.onCreateView(inflater, container, savedInstanceState)

		@CallSuper
		override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
		super.onViewCreated(view, savedInstanceState)
		if (SettingsThemeHelper.isExpressiveTheme(requireContext())) {
		// Don't allow any divider in between the preferences in expressive design.
		setDivider(null)
		listView?.addItemDecoration(MarginItemDecoration())
		}
		return view
		}

		@CallSuper
		override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
		super.onViewCreated(view, savedInstanceState)
		}

		override fun onCreateAdapter(preferenceScreen: PreferenceScreen): RecyclerView.Adapter<*> {