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

Commit d128063a authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove remember from Preference.onClick" into main

parents d24a2fc7 ef662863

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

+3 −9
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.settingslib.spa.widget.preference 


import androidx.compose.foundation.clickable

import androidx.compose.runtime.Composable

import androidx.compose.runtime.remember

import androidx.compose.ui.Modifier

import androidx.compose.ui.graphics.vector.ImageVector

import com.android.settingslib.spa.framework.common.EntryMacro
@@ -107,14 +106,9 @@ fun Preference( 
) {

    val onClickWithLog = wrapOnClickWithLog(model.onClick)

    val enabled = model.enabled()

    val modifier = remember(enabled) {

        if (onClickWithLog != null) {

            Modifier.clickable(

                enabled = enabled,

                onClick = onClickWithLog

            )

    val modifier = if (onClickWithLog != null) {

        Modifier.clickable(enabled = enabled, onClick = onClickWithLog)

    } else Modifier

    }

    EntryHighlight {

        BasePreference(

            title = model.title,