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

Merge "Fix Color Clock on AOD" into tm-qpr-dev am: 1ed40ed78f

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

Change-Id: I02847148ca63f6f70b5d80677e4bcfd497bd003c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Florence Yang
2022-11-17 00:44:14 +00:00
committed by Automerger Merge Worker
parent f20dcf55fc 1ed40ed78f
commit b16123e83d
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,7 +142,9 @@ class DefaultClockController(
currentColor = color
view.setColors(DOZE_COLOR, color)
view.animateAppearOnLockscreen()
if (!animations.dozeState.isActive) {
view.animateAppearOnLockscreen()
}
}
}
@@ -197,7 +199,7 @@ class DefaultClockController(
dozeFraction: Float,
foldFraction: Float,
) : ClockAnimations {
private val dozeState = AnimationState(dozeFraction)
internal val dozeState = AnimationState(dozeFraction)
private val foldState = AnimationState(foldFraction)
init {
@@ -238,7 +240,7 @@ class DefaultClockController(
get() = true
}
private class AnimationState(
class AnimationState(
var fraction: Float,
) {
var isActive: Boolean = fraction > 0.5f

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

@@ -43,6 +43,7 @@ import org.mockito.ArgumentMatchers.anyFloat
import org.mockito.ArgumentMatchers.anyInt
import org.mockito.ArgumentMatchers.notNull
import org.mockito.Mock
import org.mockito.Mockito.never
import org.mockito.Mockito.times
import org.mockito.Mockito.verify
import org.mockito.Mockito.`when` as whenever
@@ -178,4 +179,12 @@ class DefaultClockProviderTest : SysuiTestCase() {
verify(mockSmallClockView, times(2)).refreshFormat()
verify(mockLargeClockView, times(2)).refreshFormat()
}
@Test
fun test_aodClock_always_whiteColor() {
val clock = provider.createClock(DEFAULT_CLOCK_ID)
clock.animations.doze(0.9f) // set AOD mode to active
clock.smallClock.events.onRegionDarknessChanged(true)
verify((clock.smallClock.view as AnimatableClockView), never()).animateAppearOnLockscreen()
}
}