diff options
| author | 2024-11-04 00:37:40 +0000 | |
|---|---|---|
| committer | 2024-11-04 00:37:40 +0000 | |
| commit | c30c8cc07c52a1b85c586aa29a27048a9e07e703 (patch) | |
| tree | e3dba458ce230b6b38d38ca783f08946427bd603 | |
| parent | 9b9a570882d24f361538f2f637dbc6ea0047e455 (diff) | |
| parent | 2b073340a45d27d7185e9a83650e77a2e002ff60 (diff) | |
Merge "[Catalyst] Include dynamic icon into graph" into main
| -rw-r--r-- | packages/SettingsLib/Graph/src/com/android/settingslib/graph/PreferenceGraphBuilder.kt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SettingsLib/Graph/src/com/android/settingslib/graph/PreferenceGraphBuilder.kt b/packages/SettingsLib/Graph/src/com/android/settingslib/graph/PreferenceGraphBuilder.kt index 9cb872a797db..cf6bf7012ac2 100644 --- a/packages/SettingsLib/Graph/src/com/android/settingslib/graph/PreferenceGraphBuilder.kt +++ b/packages/SettingsLib/Graph/src/com/android/settingslib/graph/PreferenceGraphBuilder.kt @@ -270,7 +270,8 @@ private constructor(private val context: Context, private val request: GetPrefer summary = textProto { string = it.toString() } } } - if (metadata.icon != 0) icon = metadata.icon + val metadataIcon = metadata.getPreferenceIcon(context) + if (metadataIcon != 0) icon = metadataIcon if (metadata.keywords != 0) keywords = metadata.keywords val preferenceExtras = metadata.extras(context) preferenceExtras?.let { extras = it.toProto() } |