Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix dismiss callback when keyguard is dismissing." into tm-qpr-dev

Browse Source
This commit is contained in:
Aaron Liu
2023-03-29 21:08:40 +00:00
committed by Android (Google) Code Review
parent c4b1be4d6e 74f6dce985
commit 704b4a2c26
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,10 +106,9 @@ constructor(
val panelExpansionAmount: Flow<Float> = repository.panelExpansionAmount val panelExpansionAmount: Flow<Float> = repository.panelExpansionAmount
/** 0f = bouncer fully hidden. 1f = bouncer fully visible. */ /** 0f = bouncer fully hidden. 1f = bouncer fully visible. */
val bouncerExpansion: Flow<Float> = val bouncerExpansion: Flow<Float> =
combine( combine(repository.panelExpansionAmount, repository.primaryBouncerShow) {
repository.panelExpansionAmount, panelExpansion,
repository.primaryBouncerShow primaryBouncerIsShowing ->
) { panelExpansion, primaryBouncerIsShowing ->
if (primaryBouncerIsShowing) { if (primaryBouncerIsShowing) {
1f - panelExpansion 1f - panelExpansion
} else { } else {
@@ -201,6 +200,7 @@ constructor(
dismissCallbackRegistry.notifyDismissCancelled() dismissCallbackRegistry.notifyDismissCancelled()
} }
repository.setPrimaryStartDisappearAnimation(null)
falsingCollector.onBouncerHidden() falsingCollector.onBouncerHidden()
keyguardStateController.notifyPrimaryBouncerShowing(false /* showing */) keyguardStateController.notifyPrimaryBouncerShowing(false /* showing */)
cancelShowRunnable() cancelShowRunnable()
@@ -312,11 +312,8 @@ constructor(
runnable.run() runnable.run()
return return
} }
val finishRunnable = Runnable {
runnable.run() repository.setPrimaryStartDisappearAnimation(runnable)
repository.setPrimaryStartDisappearAnimation(null)
}
repository.setPrimaryStartDisappearAnimation(finishRunnable)
} }
/** Determine whether to show the side fps animation. */ /** Determine whether to show the side fps animation. */

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

@@ -131,6 +131,7 @@ class PrimaryBouncerInteractorTest : SysuiTestCase() {
verify(repository).setPrimaryShowingSoon(false) verify(repository).setPrimaryShowingSoon(false)
verify(repository).setPrimaryShow(false) verify(repository).setPrimaryShow(false)
verify(mPrimaryBouncerCallbackInteractor).dispatchVisibilityChanged(View.INVISIBLE) verify(mPrimaryBouncerCallbackInteractor).dispatchVisibilityChanged(View.INVISIBLE)
verify(repository).setPrimaryStartDisappearAnimation(null)
} }
@Test @Test