Merge "Remove remember from Preference.onClick" into main
diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/preference/Preference.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/preference/Preference.kt
index bb7e857..3acf075 100644
--- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/preference/Preference.kt
+++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/preference/Preference.kt
@@ -18,7 +18,6 @@
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 @@
) {
val onClickWithLog = wrapOnClickWithLog(model.onClick)
val enabled = model.enabled()
- val modifier = remember(enabled) {
- if (onClickWithLog != null) {
- Modifier.clickable(
- enabled = enabled,
- onClick = onClickWithLog
- )
- } else Modifier
- }
+ val modifier = if (onClickWithLog != null) {
+ Modifier.clickable(enabled = enabled, onClick = onClickWithLog)
+ } else Modifier
EntryHighlight {
BasePreference(
title = model.title,