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

Merge "Allow for disabled chip animation configuration" into udc-qpr-dev

Browse Source
This commit is contained in:
Alex Stetson
2023-08-14 16:23:08 +00:00
committed by Android (Google) Code Review
parent 22e9fe9731 461f055f84
commit 1926d7004d
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/res/values/config.xml
View File

@@ -774,6 +774,9 @@
<!-- Flag to enable privacy dot views, it shall be true for normal case -->
<bool name="config_enablePrivacyDot">true</bool>
<!-- Flag to enable privacy chip animation, it shall be true for normal case -->
<bool name="config_enablePrivacyChipAnimation">true</bool>
<!-- Class for the communal source connector to be used -->
<string name="config_communalSourceConnector" translatable="false"></string>

4
packages/SystemUI/src/com/android/systemui/statusbar/events/SystemEventCoordinator.kt
View File

@@ -164,7 +164,9 @@ constructor(
}
private fun isChipAnimationEnabled(): Boolean {
return DeviceConfig.getBoolean(NAMESPACE_PRIVACY, CHIP_ANIMATION_ENABLED, true)
val defaultValue =
context.resources.getBoolean(R.bool.config_enablePrivacyChipAnimation)
return DeviceConfig.getBoolean(NAMESPACE_PRIVACY, CHIP_ANIMATION_ENABLED, defaultValue)
}
}
}

8
packages/SystemUI/src/com/android/systemui/statusbar/events/SystemStatusAnimationSchedulerImpl.kt
View File

@@ -243,7 +243,7 @@ constructor(
if (!event.showAnimation && event.forceVisible) {
// If animations are turned off, we'll transition directly to the dot
animationState.value = SHOWING_PERSISTENT_DOT
notifyTransitionToPersistentDot()
notifyTransitionToPersistentDot(event)
return
}
@@ -335,7 +335,7 @@ constructor(
}
animators.add(chipAnimationController.onSystemEventAnimationFinish(hasPersistentDot))
if (hasPersistentDot) {
val dotAnim = notifyTransitionToPersistentDot()
val dotAnim = notifyTransitionToPersistentDot(currentlyDisplayedEvent)
if (dotAnim != null) {
animators.add(dotAnim)
}
@@ -344,12 +344,12 @@ constructor(
return AnimatorSet().also { it.playTogether(animators) }
}
private fun notifyTransitionToPersistentDot(): Animator? {
private fun notifyTransitionToPersistentDot(event: StatusEvent?): Animator? {
logger?.logTransitionToPersistentDotCallbackInvoked()
val anims: List<Animator> =
listeners.mapNotNull {
it.onSystemStatusAnimationTransitionToPersistentDot(
currentlyDisplayedEvent?.contentDescription
event?.contentDescription
)
}
if (anims.isNotEmpty()) {