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 am: 9211a131c6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20340247

Change-Id: I73dd569a3bb4ffeed78da7af7580132f83077371
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hawkwood Glazier
2022-11-03 15:37:48 +00:00
committed by Automerger Merge Worker
parent 5417edb783 9211a131c6
commit 921237f94f
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,
foldFraction: Float,
) : ClockAnimations {
private var foldState = AnimationState(0f)
private var dozeState = AnimationState(0f)
private val dozeState = AnimationState(dozeFraction)
private val foldState = AnimationState(foldFraction)
init {
dozeState = AnimationState(dozeFraction)
foldState = AnimationState(foldFraction)
if (foldState.isActive) {
clocks.forEach { it.animateFoldAppear(false) }
} else {
@@ -235,7 +232,7 @@ class DefaultClockController(
private class AnimationState(
var fraction: Float,
) {
var isActive: Boolean = fraction < 0.5f
var isActive: Boolean = fraction > 0.5f
fun update(newFraction: Float): Pair<Boolean, Boolean> {
if (newFraction == fraction) {
return Pair(isActive, false)