Merge "[Expressive design] No divider between preferences" into main (deadc63e) · Commits · e / os / android_frameworks_base

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

+13 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,9 @@

		package com.android.settingslib.widget

		import android.os.Bundle
		import android.view.View
		import androidx.annotation.CallSuper
		import androidx.preference.PreferenceFragmentCompat
		import androidx.preference.PreferenceScreen
		import androidx.recyclerview.widget.RecyclerView
		@@ -23,6 +26,15 @@ import androidx.recyclerview.widget.RecyclerView
		/** Base class for Settings to use PreferenceFragmentCompat */
		abstract class SettingsBasePreferenceFragment : PreferenceFragmentCompat() {

		@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)
		}
		}

		override fun onCreateAdapter(preferenceScreen: PreferenceScreen): RecyclerView.Adapter<*> {
		if (SettingsThemeHelper.isExpressiveTheme(requireContext()))
		return SettingsPreferenceGroupAdapter(preferenceScreen)