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

Merge "Correct clock AnimationState initialization" into tm-qpr-dev

Browse Source
This commit is contained in:
Hawkwood Glazier
2022-11-03 15:01:46 +00:00
committed by Android (Google) Code Review
parent bbe23b9b80 5e84b17a37
commit 9211a131c6
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/shared/src/com/android/systemui/shared/clocks/DefaultClockController.kt
View File

@@ -188,13 +188,10 @@ class DefaultClockController(
dozeFraction: Float, dozeFraction: Float,
foldFraction: Float, foldFraction: Float,
) : ClockAnimations { ) : ClockAnimations {
private var foldState = AnimationState(0f) private val dozeState = AnimationState(dozeFraction)
private var dozeState = AnimationState(0f) private val foldState = AnimationState(foldFraction)
init { init {
dozeState = AnimationState(dozeFraction)
foldState = AnimationState(foldFraction)
if (foldState.isActive) { if (foldState.isActive) {
clocks.forEach { it.animateFoldAppear(false) } clocks.forEach { it.animateFoldAppear(false) }
} else { } else {
@@ -235,7 +232,7 @@ class DefaultClockController(
private class AnimationState( private class AnimationState(
var fraction: Float, var fraction: Float,
) { ) {
var isActive: Boolean = fraction < 0.5f var isActive: Boolean = fraction > 0.5f
fun update(newFraction: Float): Pair<Boolean, Boolean> { fun update(newFraction: Float): Pair<Boolean, Boolean> {
if (newFraction == fraction) { if (newFraction == fraction) {
return Pair(isActive, false) return Pair(isActive, false)