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

Commit 8be06ba7 authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "[Spa] Allow AnnotatedString to be used in summary" into main

parents 89d422f6 6bcbf9dc

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/preference/BasePreference.kt

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import com.android.settingslib.spa.widget.ui.SettingsBody 
@Composable

internal fun BasePreference(

    title: String,

    summary: () -> String,

    summary: () -> CharSequence,

    modifier: Modifier = Modifier,

    titleContentDescription: String? = null,

    summaryContentDescription: () -> String? = { null },

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/preference/Preference.kt

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ interface PreferenceModel { 
    /**

     * The summary of this [Preference].

     */

    val summary: () -> String

    val summary: () -> CharSequence

        get() = { "" }



    /**

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/preference/SwitchPreference.kt

+2 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ interface SwitchPreferenceModel { 
    /**

     * The summary of this [SwitchPreference].

     */

    val summary: () -> String

    val summary: () -> CharSequence

        get() = { "" }



    /**
@@ -109,7 +109,7 @@ internal fun SwitchPreference(model: SwitchPreferenceModel, modifier: Modifier) 
internal fun InternalSwitchPreference(

    title: String,

    modifier: Modifier = Modifier,

    summary: () -> String = { "" },

    summary: () -> CharSequence = { "" },

    icon: @Composable (() -> Unit)? = null,

    checked: Boolean?,

    changeable: Boolean = true,

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/preference/TwoTargetButtonPreference.kt

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import androidx.compose.ui.graphics.vector.ImageVector 
@Composable

fun TwoTargetButtonPreference(

    title: String,

    summary: () -> String,

    summary: () -> CharSequence,

    icon: @Composable (() -> Unit)? = null,

    onClick: () -> Unit,

    buttonIcon: ImageVector,

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/preference/TwoTargetPreference.kt

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ import com.android.settingslib.spa.framework.util.wrapOnClickWithLog 
@Composable

internal fun TwoTargetPreference(

    title: String,

    summary: () -> String,

    summary: () -> CharSequence,

    primaryEnabled: () -> Boolean = { true },

    primaryOnClick: (() -> Unit)?,

    icon: @Composable (() -> Unit)? = null,