Merge remote-tracking branch 'origin/lineage-21.0' into v1-u (e51ec769) · Commits · e / os / android_frameworks_base

packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarControllerImplTest.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -290,14 +290,14 @@ public class NavigationBarControllerImplTest extends SysuiTestCase {

		@Test
		public void testShouldRenderTaskbar_taskbarNotRenderedOnPhone() {
		mNavigationBarController.mIsLargeScreen = false;
		mNavigationBarController.mTaskbarShowing = false;
		mNavigationBarController.mIsPhone = true;
		assertFalse(mNavigationBarController.supportsTaskbar());
		}

		@Test
		public void testShouldRenderTaskbar_taskbarRenderedOnTabletOrUnfolded() {
		mNavigationBarController.mIsLargeScreen = true;
		mNavigationBarController.mTaskbarShowing = true;
		mNavigationBarController.mIsPhone = false;
		assertTrue(mNavigationBarController.supportsTaskbar());
		}
		@@ -306,7 +306,7 @@ public class NavigationBarControllerImplTest extends SysuiTestCase {
		public void testShouldRenderTaskbar_taskbarRenderedInFoldedState() {
		assumeTrue(enableTaskbarNavbarUnification());

		mNavigationBarController.mIsLargeScreen = false;
		mNavigationBarController.mTaskbarShowing = false;
		mNavigationBarController.mIsPhone = false;
		assertTrue(mNavigationBarController.supportsTaskbar());
		}

+27 −1

Original line number	Diff line number	Diff line
		@@ -16,16 +16,42 @@

		package com.android.systemui.biometrics

		import android.content.Context
		import android.hardware.biometrics.common.AuthenticateReason
		import android.provider.Settings
		import kotlinx.coroutines.flow.MutableStateFlow
		import org.lineageos.platform.internal.R
		import org.mockito.Mockito

		class FakeFingerprintInteractiveToAuthProvider : FingerprintInteractiveToAuthProvider {
		override val enabledForCurrentUser: MutableStateFlow<Boolean> = MutableStateFlow(false)

		private val mockContext = Mockito.mock(Context::class.java)

		private val defaultValue = if (mockContext.resources.getBoolean(
		R.bool.config_fingerprintWakeAndUnlock)) {
		1
		} else {
		0
		}

		private val userIdToExtension = mutableMapOf<Int, AuthenticateReason.Vendor>()

		override fun getVendorExtension(userId: Int): AuthenticateReason.Vendor? =
		userIdToExtension[userId]

		override fun isEnabled(userId: Int): Boolean {
		var value = Settings.Secure.getIntForUser(
		mockContext.contentResolver, Settings.Secure.SFPS_PERFORMANT_AUTH_ENABLED,
		-1,
		userId,
		)
		if (value == -1) {
		value = defaultValue
		}
		return value == 0
		}

		fun setVendorExtension(userId: Int, extension: AuthenticateReason.Vendor) {
		userIdToExtension[userId] = extension
		}