Merge "Fix notification shade pull down not pausing UDFPS authentication" into main (95722edc) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/UdfpsControllerOverlayTest.kt

+3 −2

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ import com.android.systemui.dump.DumpManager
		import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor
		import com.android.systemui.plugins.statusbar.StatusBarStateController
		import com.android.systemui.res.R
		import com.android.systemui.shade.domain.interactor.ShadeInteractor
		import com.android.systemui.statusbar.LockscreenShadeTransitionController
		import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager
		import com.android.systemui.statusbar.phone.SystemUIDialogManager
		@@ -54,7 +55,6 @@ import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController
		import com.android.systemui.statusbar.policy.ConfigurationController
		import com.android.systemui.statusbar.policy.KeyguardStateController
		import com.android.systemui.user.domain.interactor.SelectedUserInteractor
		import com.android.systemui.util.settings.SecureSettings
		import com.google.common.truth.Truth.assertThat
		import kotlinx.coroutines.ExperimentalCoroutinesApi
		import org.junit.Before
		@@ -101,7 +101,6 @@ class UdfpsControllerOverlayTest : SysuiTestCase() {
		@Mock
		private lateinit var unlockedScreenOffAnimationController: UnlockedScreenOffAnimationController
		@Mock private lateinit var udfpsDisplayMode: UdfpsDisplayModeProvider
		@Mock private lateinit var secureSettings: SecureSettings
		@Mock private lateinit var controllerCallback: IUdfpsOverlayControllerCallback
		@Mock private lateinit var udfpsController: UdfpsController
		@Mock private lateinit var udfpsView: UdfpsView
		@@ -117,6 +116,7 @@ class UdfpsControllerOverlayTest : SysuiTestCase() {
		@Mock
		private lateinit var udfpsKeyguardAccessibilityDelegate: UdfpsKeyguardAccessibilityDelegate
		@Mock private lateinit var keyguardTransitionInteractor: KeyguardTransitionInteractor
		@Mock private lateinit var shadeInteractor: ShadeInteractor
		@Captor private lateinit var layoutParamsCaptor: ArgumentCaptor<WindowManager.LayoutParams>

		private val onTouch = { _: View, _: MotionEvent, _: Boolean -> true }
		@@ -174,6 +174,7 @@ class UdfpsControllerOverlayTest : SysuiTestCase() {
		mSelectedUserInteractor,
		{ deviceEntryUdfpsTouchOverlayViewModel },
		{ defaultUdfpsTouchOverlayViewModel },
		shadeInteractor
		)
		block()
		}

packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/UdfpsControllerTest.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,7 @@ import com.android.systemui.log.SessionTracker;
		import com.android.systemui.plugins.FalsingManager;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.res.R;
		import com.android.systemui.shade.domain.interactor.ShadeInteractor;
		import com.android.systemui.statusbar.LockscreenShadeTransitionController;
		import com.android.systemui.statusbar.VibratorHelper;
		import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
		@@ -205,6 +206,8 @@ public class UdfpsControllerTest extends SysuiTestCase {
		@Mock
		private PrimaryBouncerInteractor mPrimaryBouncerInteractor;
		@Mock
		private ShadeInteractor mShadeInteractor;
		@Mock
		private SinglePointerTouchProcessor mSinglePointerTouchProcessor;
		@Mock
		private SessionTracker mSessionTracker;
		@@ -328,6 +331,7 @@ public class UdfpsControllerTest extends SysuiTestCase {
		mActivityLaunchAnimator,
		mBiometricExecutor,
		mPrimaryBouncerInteractor,
		mShadeInteractor,
		mSinglePointerTouchProcessor,
		mSessionTracker,
		mAlternateBouncerInteractor,

packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/UdfpsKeyguardViewLegacyControllerBaseTest.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInterac
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.shade.ShadeExpansionChangeEvent;
		import com.android.systemui.shade.ShadeExpansionStateManager;
		import com.android.systemui.shade.domain.interactor.ShadeInteractor;
		import com.android.systemui.statusbar.LockscreenShadeTransitionController;
		import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
		import com.android.systemui.statusbar.phone.SystemUIDialogManager;
		@@ -70,6 +71,7 @@ public class UdfpsKeyguardViewLegacyControllerBaseTest extends SysuiTestCase {
		protected @Mock UdfpsController mUdfpsController;
		protected @Mock ActivityLaunchAnimator mActivityLaunchAnimator;
		protected @Mock PrimaryBouncerInteractor mPrimaryBouncerInteractor;
		protected @Mock ShadeInteractor mShadeInteractor;
		protected @Mock AlternateBouncerInteractor mAlternateBouncerInteractor;
		protected @Mock UdfpsKeyguardAccessibilityDelegate mUdfpsKeyguardAccessibilityDelegate;
		protected @Mock SelectedUserInteractor mSelectedUserInteractor;
		@@ -149,7 +151,8 @@ public class UdfpsKeyguardViewLegacyControllerBaseTest extends SysuiTestCase {
		mAlternateBouncerInteractor,
		mUdfpsKeyguardAccessibilityDelegate,
		mSelectedUserInteractor,
		mKeyguardTransitionInteractor);
		mKeyguardTransitionInteractor,
		mShadeInteractor);
		return controller;
		}
		}

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimationViewController.kt

+8 −12

Original line number	Diff line number	Diff line
		@@ -23,16 +23,14 @@ import androidx.lifecycle.Lifecycle
		import androidx.lifecycle.repeatOnLifecycle
		import com.android.app.animation.Interpolators
		import com.android.systemui.Dumpable
		import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor
		import com.android.systemui.dump.DumpManager
		import com.android.systemui.lifecycle.repeatWhenAttached
		import com.android.systemui.plugins.statusbar.StatusBarStateController
		import com.android.systemui.statusbar.StatusBarState.SHADE
		import com.android.systemui.shade.domain.interactor.ShadeInteractor
		import com.android.systemui.statusbar.phone.SystemUIDialogManager
		import com.android.systemui.util.ViewController
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.Job
		import kotlinx.coroutines.flow.map
		import kotlinx.coroutines.launch
		import java.io.PrintWriter

		@@ -49,7 +47,7 @@ import java.io.PrintWriter
		abstract class UdfpsAnimationViewController<T : UdfpsAnimationView>(
		view: T,
		protected val statusBarStateController: StatusBarStateController,
		protected val primaryBouncerInteractor: PrimaryBouncerInteractor,
		protected val shadeInteractor: ShadeInteractor,
		protected val dialogManager: SystemUIDialogManager,
		private val dumpManager: DumpManager
		) : ViewController<T>(view), Dumpable {
		@@ -94,23 +92,21 @@ abstract class UdfpsAnimationViewController<T : UdfpsAnimationView>(
		// can make the view not visible; and we still want to listen for events
		// that may make the view visible again.
		repeatOnLifecycle(Lifecycle.State.CREATED) {
		listenForBouncerExpansion(this)
		listenForShadeExpansion(this)
		}
		}
		}

		@VisibleForTesting
		open suspend fun listenForBouncerExpansion(scope: CoroutineScope): Job {
		suspend fun listenForShadeExpansion(scope: CoroutineScope): Job {
		return scope.launch {
		primaryBouncerInteractor.bouncerExpansion.map { 1f - it }.collect { expansion: Float ->
		if (statusBarStateController.state != SHADE) {
		shadeInteractor.anyExpansion.collect { expansion ->
		notificationShadeVisible = expansion > 0f
		view.onExpansionChanged(expansion)
		updatePauseAuth()
		}
		}
		}
		}

		fun runDialogAlphaAnimator() {
		val hideAffordance = dialogManager.shouldHideAffordance()

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsBpViewController.kt

+3 −3

Original line number	Diff line number	Diff line
		@@ -15,9 +15,9 @@
		*/
		package com.android.systemui.biometrics

		import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor
		import com.android.systemui.dump.DumpManager
		import com.android.systemui.plugins.statusbar.StatusBarStateController
		import com.android.systemui.shade.domain.interactor.ShadeInteractor
		import com.android.systemui.statusbar.phone.SystemUIDialogManager

		/**
		@@ -26,13 +26,13 @@ import com.android.systemui.statusbar.phone.SystemUIDialogManager
		class UdfpsBpViewController(
		view: UdfpsBpView,
		statusBarStateController: StatusBarStateController,
		primaryBouncerInteractor: PrimaryBouncerInteractor,
		shadeInteractor: ShadeInteractor,
		systemUIDialogManager: SystemUIDialogManager,
		dumpManager: DumpManager
		) : UdfpsAnimationViewController<UdfpsBpView>(
		view,
		statusBarStateController,
		primaryBouncerInteractor,
		shadeInteractor,
		systemUIDialogManager,
		dumpManager
		) {