Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01e8b209 authored by Jacky Wang's avatar Jacky Wang
Browse files

[Catalyst] Move getPreferenceTitle out of PreferenceMetadata 

Bug: 388167106
Flag: EXEMPT refactor
Test: atest
Change-Id: Ic49a536b725336437ffa4d9fbbe0335609234476
parent d5979527

packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceMetadata.kt

+0 −12
Original line number Diff line number Diff line
@@ -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. */

packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/Utils.kt

+8 −0
Original line number Diff line number Diff line
@@ -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 {

packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBinding.kt

+1 −0
Original line number Diff line number Diff line
@@ -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 {