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

Commit 6f12009c authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Transitions - Add ALTERNATE_BOUNCER support" into tm-qpr-dev am: 1984333c am: 7b4c5e6d 

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



Change-Id: Ic92b5e5fe7f0f1ba59c554f7b043eb80348d7fba
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5c272883 7b4c5e6d

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt

+1 −1
Original line number Diff line number Diff line
@@ -928,7 +928,7 @@ class KeyguardUnlockAnimationController @Inject constructor( 
        }



        // The smartspace is not visible if the bouncer is showing, so don't shared element it.

        if (keyguardStateController.isBouncerShowing) {

        if (keyguardStateController.isPrimaryBouncerShowing) {

            return false

        }

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+3 −3
Original line number Diff line number Diff line
@@ -1150,12 +1150,12 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
    private final KeyguardStateController.Callback mKeyguardStateControllerCallback =

            new KeyguardStateController.Callback() {

        @Override

        public void onBouncerShowingChanged() {

        public void onPrimaryBouncerShowingChanged() {

            synchronized (KeyguardViewMediator.this) {

                if (mKeyguardStateController.isBouncerShowing()) {

                if (mKeyguardStateController.isPrimaryBouncerShowing()) {

                    mPendingPinLock = false;

                }

                adjustStatusBarLocked(mKeyguardStateController.isBouncerShowing(), false);

                adjustStatusBarLocked(mKeyguardStateController.isPrimaryBouncerShowing(), false);

            }

        }

    };

packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardBouncerRepository.kt

+11 −11
Original line number Diff line number Diff line
@@ -68,8 +68,8 @@ interface KeyguardBouncerRepository { 
    val resourceUpdateRequests: StateFlow<Boolean>

    val bouncerPromptReason: Int

    val bouncerErrorMessage: CharSequence?

    val isAlternateBouncerVisible: StateFlow<Boolean>

    val isAlternateBouncerUIAvailable: StateFlow<Boolean>

    val alternateBouncerVisible: StateFlow<Boolean>

    val alternateBouncerUIAvailable: StateFlow<Boolean>

    var lastAlternateBouncerVisibleTime: Long



    fun setPrimaryScrimmed(isScrimmed: Boolean)
@@ -159,12 +159,12 @@ constructor( 
        get() = viewMediatorCallback.consumeCustomMessage()



    /** Values associated with the AlternateBouncer */

    private val _isAlternateBouncerVisible = MutableStateFlow(false)

    override val isAlternateBouncerVisible = _isAlternateBouncerVisible.asStateFlow()

    private val _alternateBouncerVisible = MutableStateFlow(false)

    override val alternateBouncerVisible = _alternateBouncerVisible.asStateFlow()

    override var lastAlternateBouncerVisibleTime: Long = NOT_VISIBLE

    private val _isAlternateBouncerUIAvailable = MutableStateFlow(false)

    override val isAlternateBouncerUIAvailable: StateFlow<Boolean> =

        _isAlternateBouncerUIAvailable.asStateFlow()

    private val _alternateBouncerUIAvailable = MutableStateFlow(false)

    override val alternateBouncerUIAvailable: StateFlow<Boolean> =

        _alternateBouncerUIAvailable.asStateFlow()



    init {

        setUpLogging()
@@ -179,16 +179,16 @@ constructor( 
    }



    override fun setAlternateVisible(isVisible: Boolean) {

        if (isVisible && !_isAlternateBouncerVisible.value) {

        if (isVisible && !_alternateBouncerVisible.value) {

            lastAlternateBouncerVisibleTime = clock.uptimeMillis()

        } else if (!isVisible) {

            lastAlternateBouncerVisibleTime = NOT_VISIBLE

        }

        _isAlternateBouncerVisible.value = isVisible

        _alternateBouncerVisible.value = isVisible

    }



    override fun setAlternateBouncerUIAvailable(isAvailable: Boolean) {

        _isAlternateBouncerUIAvailable.value = isAvailable

        _alternateBouncerUIAvailable.value = isAvailable

    }



    override fun setPrimaryShow(keyguardBouncerModel: KeyguardBouncerModel?) {
@@ -290,7 +290,7 @@ constructor( 
        resourceUpdateRequests

            .logDiffsForTable(buffer, "", "ResourceUpdateRequests", false)

            .launchIn(applicationScope)

        isAlternateBouncerUIAvailable

        alternateBouncerUIAvailable

            .logDiffsForTable(buffer, "", "IsAlternateBouncerUIAvailable", false)

            .launchIn(applicationScope)

    }

packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepository.kt

+0 −26
Original line number Diff line number Diff line
@@ -86,9 +86,6 @@ interface KeyguardRepository { 
    /** Observable for the signal that keyguard is about to go away. */

    val isKeyguardGoingAway: Flow<Boolean>



    /** Observable for whether the bouncer is showing. */

    val isBouncerShowing: Flow<Boolean>



    /** Is the always-on display available to be used? */

    val isAodAvailable: Flow<Boolean>
@@ -304,29 +301,6 @@ constructor( 
        awaitClose { keyguardStateController.removeCallback(callback) }

    }



    override val isBouncerShowing: Flow<Boolean> = conflatedCallbackFlow {

        val callback =

            object : KeyguardStateController.Callback {

                override fun onBouncerShowingChanged() {

                    trySendWithFailureLogging(

                        keyguardStateController.isBouncerShowing,

                        TAG,

                        "updated isBouncerShowing"

                    )

                }

            }



        keyguardStateController.addCallback(callback)

        // Adding the callback does not send an initial update.

        trySendWithFailureLogging(

            keyguardStateController.isBouncerShowing,

            TAG,

            "initial isBouncerShowing"

        )



        awaitClose { keyguardStateController.removeCallback(callback) }

    }



    override val isDozing: Flow<Boolean> =

        conflatedCallbackFlow {

                val callback =

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/AlternateBouncerInteractor.kt

+3 −3
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ constructor( 
    var legacyAlternateBouncer: LegacyAlternateBouncer? = null

    var legacyAlternateBouncerVisibleTime: Long = NOT_VISIBLE



    val isVisible: Flow<Boolean> = bouncerRepository.isAlternateBouncerVisible

    val isVisible: Flow<Boolean> = bouncerRepository.alternateBouncerVisible



    /**

     * Sets the correct bouncer states to show the alternate bouncer if it can show.
@@ -86,7 +86,7 @@ constructor( 


    fun isVisibleState(): Boolean {

        return if (isModernAlternateBouncerEnabled) {

            bouncerRepository.isAlternateBouncerVisible.value

            bouncerRepository.alternateBouncerVisible.value

        } else {

            legacyAlternateBouncer?.isShowingAlternateBouncer ?: false

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


    fun canShowAlternateBouncerForFingerprint(): Boolean {

        return if (isModernAlternateBouncerEnabled) {

            bouncerRepository.isAlternateBouncerUIAvailable.value &&

            bouncerRepository.alternateBouncerUIAvailable.value &&

                biometricSettingsRepository.isFingerprintEnrolled.value &&

                biometricSettingsRepository.isStrongBiometricAllowed.value &&

                biometricSettingsRepository.isFingerprintEnabledByDevicePolicy.value &&