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

Commit d3566f5f authored by Dhina17's avatar Dhina17
Browse files

ScreenOffAnimation: Fix system animation disable check 

Settings sets the animator_duration_scale value to a float value of 0.0.
Getting its value as a string returns '0.0' not '0'.
So the check is broken here.

Because of this, UnlockedScreenOffAnimationController tries to
start the AOD screen animation even if the system animation disabled.
It makes the AOD screen goes black or just status bar visible due to the
animation flow messed up.
It's even worse and clearly noticeable when screen lock is set to none.

Test:
1. Set screen lock to 'None'
2. Turn off system animations in developer settings.
3. Enable AOD.
4. Turn off screen via power button.
5. AOD screen is visible correctly

Change-Id: Icc3753c8cb462c1233b418095e4129eb992c1f9c
parent 98551756

packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt

+2 −2
Original line number Diff line number Diff line
@@ -324,8 +324,8 @@ class UnlockedScreenOffAnimationController @Inject constructor( 
        }



        // If animations are disabled system-wide, don't play this one either.

        if (Settings.Global.getString(

                context.contentResolver, Settings.Global.ANIMATOR_DURATION_SCALE) == "0") {

        if (Settings.Global.getFloat(

                context.contentResolver, Settings.Global.ANIMATOR_DURATION_SCALE) == 0f) {

            return false

        }

packages/SystemUI/src/com/android/systemui/unfold/FoldAodAnimationController.kt

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ constructor( 
    private fun shouldStartAnimation(): Boolean =

        alwaysOnEnabled &&

            wakefulnessLifecycle.lastSleepReason == PowerManager.GO_TO_SLEEP_REASON_DEVICE_FOLD &&

            globalSettings.getString(Settings.Global.ANIMATOR_DURATION_SCALE) != "0"

            globalSettings.getFloat(Settings.Global.ANIMATOR_DURATION_SCALE) != 0f



    override fun startAnimation(): Boolean =

        if (shouldStartAnimation()) {