Merge "Make sure subclasses calls super.onCreateView() if override in the subclass." into main (a6e1a188) · Commits · e / os / android_frameworks_base

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

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -17,7 +17,9 @@
	package com.android.settingslib.widget		package com.android.settingslib.widget

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

			@CallSuper
			override fun onCreateView(
			inflater: LayoutInflater,
			container: ViewGroup?,
			savedInstanceState: Bundle?
			): View {
			return super.onCreateView(inflater, container, savedInstanceState)
			}

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