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

Commit ef662863 authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Remove remember from Preference.onClick 

Which was causing old onClick was used when click.

Bug: 327425969
Test: manual - on Mobile Settings
Change-Id: I1af16869d6ecf057e23115bfc86d9b656347d9fb
parent 71175c17

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,