Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix highlight animation bug."

Browse Source
This commit is contained in:
Kelly Zhang
2022-10-31 02:44:58 +00:00
committed by Android (Google) Code Review
parent 1328cadf0a f41853a87e
commit 1bfc06ed17
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/util/EntryHighlight.kt
View File

@@ -36,14 +36,15 @@ import com.android.settingslib.spa.framework.theme.SettingsTheme
@Composable
internal fun EntryHighlight(UiLayoutFn: @Composable () -> Unit) {
val entryData = LocalEntryDataProvider.current
var isHighlighted by rememberSaveable { mutableStateOf(false) }
val entryIsHighlighted = rememberSaveable { entryData.isHighlighted }
var localHighlighted by rememberSaveable { mutableStateOf(false) }
SideEffect {
isHighlighted = entryData.isHighlighted
localHighlighted = entryIsHighlighted
}
val backgroundColor by animateColorAsState(
targetValue = when {
isHighlighted -> MaterialTheme.colorScheme.surfaceVariant
localHighlighted -> MaterialTheme.colorScheme.surfaceVariant
else -> SettingsTheme.colorScheme.background
},
animationSpec = repeatable(