diff options
3 files changed, 9 insertions, 12 deletions
diff --git a/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceMetadata.kt b/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceMetadata.kt index 0f4958bf9690..fcca82330d10 100644 --- a/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceMetadata.kt +++ b/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceMetadata.kt @@ -137,18 +137,6 @@ interface PreferenceMetadata { /** Returns preference intent. */ fun intent(context: Context): Intent? = null - - /** - * Returns the preference title. - * - * Implement [PreferenceTitleProvider] interface if title content is generated dynamically. - */ - fun getPreferenceTitle(context: Context): CharSequence? = - when { - title != 0 -> context.getText(title) - this is PreferenceTitleProvider -> getTitle(context) - else -> null - } } /** Metadata of preference group. */ diff --git a/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/Utils.kt b/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/Utils.kt index c37eaafbb121..77da98cec905 100644 --- a/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/Utils.kt +++ b/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/Utils.kt @@ -18,6 +18,14 @@ package com.android.settingslib.metadata import android.content.Context +/** Returns the preference title. */ +fun PreferenceMetadata.getPreferenceTitle(context: Context): CharSequence? = + when { + title != 0 -> context.getText(title) + this is PreferenceTitleProvider -> getTitle(context) + else -> null + } + /** Returns the preference summary. */ fun PreferenceMetadata.getPreferenceSummary(context: Context): CharSequence? = when { diff --git a/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBinding.kt b/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBinding.kt index c6a4a4dcd319..604acaf2a380 100644 --- a/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBinding.kt +++ b/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBinding.kt @@ -33,6 +33,7 @@ import com.android.settingslib.metadata.PreferenceMetadata import com.android.settingslib.metadata.PreferenceScreenMetadata import com.android.settingslib.metadata.getPreferenceIcon import com.android.settingslib.metadata.getPreferenceSummary +import com.android.settingslib.metadata.getPreferenceTitle /** Binding of preference widget and preference metadata. */ interface PreferenceBinding { |