Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25288795 authored by Alex Stetson's avatar Alex Stetson Committed by Automerger Merge Worker
Browse files

Merge "Allow for disabled chip animation configuration" into udc-qpr-dev am: 1926d700 

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



Change-Id: I74f9b33d9fae67ab4a4c5cbaa47934350e03b907
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8c4bdc0b 1926d700

packages/SystemUI/res/values/config.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -774,6 +774,9 @@ 
    <!-- Flag to enable privacy dot views, it shall be true for normal case -->

    <!-- Flag to enable privacy dot views, it shall be true for normal case -->

    <bool name="config_enablePrivacyDot">true</bool>

    <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 -->

    <!-- Class for the communal source connector to be used -->

    <string name="config_communalSourceConnector" translatable="false"></string>

    <string name="config_communalSourceConnector" translatable="false"></string>

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -164,7 +164,9 @@ constructor( 
        }

        }





        private fun isChipAnimationEnabled(): Boolean {

        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)

        }

        }

    }

    }

}

}

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -243,7 +243,7 @@ constructor( 
        if (!event.showAnimation && event.forceVisible) {

        if (!event.showAnimation && event.forceVisible) {

            // If animations are turned off, we'll transition directly to the dot

            // If animations are turned off, we'll transition directly to the dot

            animationState.value = SHOWING_PERSISTENT_DOT

            animationState.value = SHOWING_PERSISTENT_DOT

            notifyTransitionToPersistentDot()

            notifyTransitionToPersistentDot(event)

            return

            return

        }

        }
@@ -335,7 +335,7 @@ constructor( 
        }

        }

        animators.add(chipAnimationController.onSystemEventAnimationFinish(hasPersistentDot))

        animators.add(chipAnimationController.onSystemEventAnimationFinish(hasPersistentDot))

        if (hasPersistentDot) {

        if (hasPersistentDot) {

            val dotAnim = notifyTransitionToPersistentDot()

            val dotAnim = notifyTransitionToPersistentDot(currentlyDisplayedEvent)

            if (dotAnim != null) {

            if (dotAnim != null) {

                animators.add(dotAnim)

                animators.add(dotAnim)

            }

            }
@@ -344,12 +344,12 @@ constructor( 
        return AnimatorSet().also { it.playTogether(animators) }

        return AnimatorSet().also { it.playTogether(animators) }

    }

    }





    private fun notifyTransitionToPersistentDot(): Animator? {

    private fun notifyTransitionToPersistentDot(event: StatusEvent?): Animator? {

        logger?.logTransitionToPersistentDotCallbackInvoked()

        logger?.logTransitionToPersistentDotCallbackInvoked()

        val anims: List<Animator> =

        val anims: List<Animator> =

            listeners.mapNotNull {

            listeners.mapNotNull {

                it.onSystemStatusAnimationTransitionToPersistentDot(

                it.onSystemStatusAnimationTransitionToPersistentDot(

                    currentlyDisplayedEvent?.contentDescription

                    event?.contentDescription

                )

                )

            }

            }

        if (anims.isNotEmpty()) {

        if (anims.isNotEmpty()) {