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

Commit ff4a0d70 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix dismiss callback when keyguard is dismissing." into udc-dev am: e8859325 

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



Change-Id: I40cd1fdbb8ac72182453c1c1fda072ce3180caa6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6b42531d e8859325

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

+6 −11
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ import android.content.res.ColorStateList 
import android.hardware.biometrics.BiometricSourceType

import android.os.Handler

import android.os.Trace

import android.os.UserHandle

import android.os.UserManager

import android.util.Log

import android.view.View

import com.android.keyguard.KeyguardConstants
@@ -106,10 +104,9 @@ constructor( 
    val panelExpansionAmount: Flow<Float> = repository.panelExpansionAmount

    /** 0f = bouncer fully hidden. 1f = bouncer fully visible. */

    val bouncerExpansion: Flow<Float> =

        combine(

            repository.panelExpansionAmount,

            repository.primaryBouncerShow

        ) { panelExpansion, primaryBouncerIsShowing ->

        combine(repository.panelExpansionAmount, repository.primaryBouncerShow) {

            panelExpansion,

            primaryBouncerIsShowing ->

            if (primaryBouncerIsShowing) {

                1f - panelExpansion

            } else {
@@ -195,6 +192,7 @@ constructor( 
            dismissCallbackRegistry.notifyDismissCancelled()

        }



        repository.setPrimaryStartDisappearAnimation(null)

        falsingCollector.onBouncerHidden()

        keyguardStateController.notifyPrimaryBouncerShowing(false /* showing */)

        cancelShowRunnable()
@@ -306,11 +304,8 @@ constructor( 
            runnable.run()

            return

        }

        val finishRunnable = Runnable {

            runnable.run()

            repository.setPrimaryStartDisappearAnimation(null)

        }

        repository.setPrimaryStartDisappearAnimation(finishRunnable)



        repository.setPrimaryStartDisappearAnimation(runnable)

    }



    /** Determine whether to show the side fps animation. */

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

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ class PrimaryBouncerInteractorTest : SysuiTestCase() { 
        verify(repository).setPrimaryShowingSoon(false)

        verify(repository).setPrimaryShow(false)

        verify(mPrimaryBouncerCallbackInteractor).dispatchVisibilityChanged(View.INVISIBLE)

        verify(repository).setPrimaryStartDisappearAnimation(null)

    }



    @Test