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

Merge "Fix || for != in QSTileViewImpl" into udc-dev

Browse Source
This commit is contained in:
Fabian Kozynski
2023-03-31 17:34:15 +00:00
committed by Android (Google) Code Review
parent 7a6c7ba69b 220ea0932c
commit 952b8f1592
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt
View File

@@ -496,7 +496,7 @@ open class QSTileViewImpl @JvmOverloads constructor(
}
// Colors
if (state.state != lastState || state.disabledByPolicy || lastDisabledByPolicy) {
if (state.state != lastState || state.disabledByPolicy != lastDisabledByPolicy) {
singleAnimator.cancel()
mQsLogger?.logTileBackgroundColorUpdateIfInternetTile(
state.spec,

20
packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSTileViewImplTest.kt
View File

@@ -316,6 +316,26 @@ class QSTileViewImplTest : SysuiTestCase() {
assertThat(colorsDisabledByPolicy).containsExactlyElementsIn(colorsUnavailable)
}
@Test
fun testDisableByPolicyThenRemoved_changesColor() {
val stateActive = QSTile.State()
stateActive.state = Tile.STATE_ACTIVE
val stateDisabledByPolicy = stateActive.copy()
stateDisabledByPolicy.disabledByPolicy = true
tileView.changeState(stateActive)
val activeColors = tileView.getCurrentColors()
tileView.changeState(stateDisabledByPolicy)
// It has unavailable colors
assertThat(tileView.getCurrentColors()).isNotEqualTo(activeColors)
// When we get back to not disabled by policy tile, it should go back to active colors
tileView.changeState(stateActive)
assertThat(tileView.getCurrentColors()).containsExactlyElementsIn(activeColors)
}
@Test
fun testDisabledByPolicy_secondaryLabelText() {
val testA11yLabel = "TEST_LABEL"