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

Commit bb9f5bec authored by Josh Tsuji's avatar Josh Tsuji
Browse files

Don't play screen off animation if we are upside down unless that's allowed. 

Bug: 196364593
Test: be upside down, turn the screen off
Change-Id: I6c4f5c93c9c2c7fe2348edd842e6c4f3276c3600
parent 4617507f

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

+5 −4
Original line number Diff line number Diff line
@@ -4,10 +4,10 @@ import android.animation.Animator 
import android.animation.AnimatorListenerAdapter

import android.animation.ValueAnimator

import android.content.Context

import android.content.res.Configuration

import android.database.ContentObserver

import android.os.Handler

import android.provider.Settings

import android.view.Surface

import android.view.View

import com.android.systemui.animation.Interpolators

import com.android.systemui.dagger.SysUISingleton
@@ -239,10 +239,11 @@ class UnlockedScreenOffAnimationController @Inject constructor( 
            return false

        }



        // If we're not allowed to rotate the keyguard, then only do the screen off animation if

        // we're in portrait. Otherwise, AOD will animate in sideways, which looks weird.

        // If we're not allowed to rotate the keyguard, it can only be displayed in zero-degree

        // portrait. If we're in another orientation, disable the screen off animation so we don't

        // animate in the keyguard AOD UI sideways or upside down.

        if (!keyguardStateController.isKeyguardScreenRotationAllowed &&

                context.resources.configuration.orientation != Configuration.ORIENTATION_PORTRAIT) {

            context.display.rotation != Surface.ROTATION_0) {

            return false

        }