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

Browse Source
This commit is contained in:
Florence Yang
2022-11-17 00:16:47 +00:00
committed by Android (Google) Code Review
parent 6e3271fdb0 cb59b0b7f4
commit 1ed40ed78f
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,9 +142,11 @@ class DefaultClockController(
currentColor = color currentColor = color
view.setColors(DOZE_COLOR, color) view.setColors(DOZE_COLOR, color)
if (!animations.dozeState.isActive) {
view.animateAppearOnLockscreen() view.animateAppearOnLockscreen()
} }
} }
}
inner class LargeClockFaceController( inner class LargeClockFaceController(
view: AnimatableClockView, view: AnimatableClockView,
@@ -197,7 +199,7 @@ class DefaultClockController(
dozeFraction: Float, dozeFraction: Float,
foldFraction: Float, foldFraction: Float,
) : ClockAnimations { ) : ClockAnimations {
private val dozeState = AnimationState(dozeFraction) internal val dozeState = AnimationState(dozeFraction)
private val foldState = AnimationState(foldFraction) private val foldState = AnimationState(foldFraction)
init { init {
@@ -238,7 +240,7 @@ class DefaultClockController(
get() = true get() = true
} }
private class AnimationState( class AnimationState(
var fraction: Float, var fraction: Float,
) { ) {
var isActive: Boolean = fraction > 0.5f 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.anyInt
import org.mockito.ArgumentMatchers.notNull import org.mockito.ArgumentMatchers.notNull
import org.mockito.Mock import org.mockito.Mock
import org.mockito.Mockito.never
import org.mockito.Mockito.times import org.mockito.Mockito.times
import org.mockito.Mockito.verify import org.mockito.Mockito.verify
import org.mockito.Mockito.`when` as whenever import org.mockito.Mockito.`when` as whenever
@@ -178,4 +179,12 @@ class DefaultClockProviderTest : SysuiTestCase() {
verify(mockSmallClockView, times(2)).refreshFormat() verify(mockSmallClockView, times(2)).refreshFormat()
verify(mockLargeClockView, 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()
}
} }