Merge "[Bouncer] ensure that bouncer expansion callback.." into tm-qpr-dev (837507ea) · Commits · e / os / android_frameworks_base

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

+3 −5

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.os.Handler
		import android.os.Trace
		import android.os.UserHandle
		import android.os.UserManager
		import android.view.View
		import com.android.keyguard.KeyguardSecurityModel
		import com.android.keyguard.KeyguardUpdateMonitor
		import com.android.systemui.DejankUtils
		@@ -84,6 +85,7 @@ constructor(
		)
		)
		repository.setPrimaryShowingSoon(false)
		primaryBouncerCallbackInteractor.dispatchVisibilityChanged(View.VISIBLE)
		}

		val keyguardAuthenticated: Flow<Boolean> = repository.keyguardAuthenticated.filterNotNull()
		@@ -182,6 +184,7 @@ constructor(
		repository.setPrimaryVisible(false)
		repository.setPrimaryHide(true)
		repository.setPrimaryShow(null)
		primaryBouncerCallbackInteractor.dispatchVisibilityChanged(View.INVISIBLE)
		Trace.endSection()
		}

		@@ -276,11 +279,6 @@ constructor(
		repository.setShowMessage(null)
		}

		/** Notify that view visibility has changed. */
		fun notifyBouncerVisibilityHasChanged(visibility: Int) {
		primaryBouncerCallbackInteractor.dispatchVisibilityChanged(visibility)
		}

		/** Notify that the resources have been updated */
		fun notifyUpdatedResources() {
		repository.setResourceUpdateRequests(false)

+0 −1

Original line number	Diff line number	Diff line
		@@ -152,7 +152,6 @@ object KeyguardBouncerViewBinder {
		val visibility = if (isVisible) View.VISIBLE else View.INVISIBLE
		view.visibility = visibility
		hostViewController.onBouncerVisibilityChanged(visibility)
		viewModel.notifyBouncerVisibilityHasChanged(visibility)
		}
		}

+0 −4

Original line number	Diff line number	Diff line
		@@ -72,10 +72,6 @@ constructor(
		/** Observe whether screen is turned off. */
		val screenTurnedOff: Flow<Unit> = interactor.screenTurnedOff

		/** Notify that view visibility has changed. */
		fun notifyBouncerVisibilityHasChanged(visibility: Int) {
		return interactor.notifyBouncerVisibilityHasChanged(visibility)
		}
		/** Observe whether we want to update resources. */
		fun notifyUpdateResources() {
		interactor.notifyUpdatedResources()

+3 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.systemui.keyguard.domain.interactor
		import android.os.Looper
		import android.testing.AndroidTestingRunner
		import android.testing.TestableLooper.RunWithLooper
		import android.view.View
		import androidx.test.filters.SmallTest
		import com.android.keyguard.KeyguardSecurityModel
		import com.android.keyguard.KeyguardUpdateMonitor
		@@ -106,6 +107,7 @@ class PrimaryBouncerInteractorTest : SysuiTestCase() {
		verify(repository).setPrimaryVisible(true)
		verify(repository).setPrimaryShow(any(KeyguardBouncerModel::class.java))
		verify(repository).setPrimaryShowingSoon(false)
		verify(mPrimaryBouncerCallbackInteractor).dispatchVisibilityChanged(View.VISIBLE)
		}

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

		@Test

+1 −1

File changed.

Contains only whitespace changes.