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

Merge "Revert "Adds assets, removes SFPS indicator, updates BP controller for rear display/tent mode"" into tm-qpr-dev

Browse Source
This commit is contained in:
Grace Cheng
2023-03-18 05:22:05 +00:00
committed by Android (Google) Code Review
parent cc0599f27a 6363e0e331
commit 019c928610
8 changed files with 22 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/res/raw/biometricprompt_rear_landscape_base.json
View File

File diff suppressed because one or more lines are too long

1
packages/SystemUI/res/raw/biometricprompt_rear_portrait_base.json
View File

File diff suppressed because one or more lines are too long

1
packages/SystemUI/res/raw/biometricprompt_rear_portrait_reverse_base.json
View File

File diff suppressed because one or more lines are too long

38
packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFingerprintIconController.kt
View File

@@ -230,29 +230,21 @@ open class AuthBiometricFingerprintIconController(
if (isReverseDefaultRotation) (rotation + 1) % 4 else rotation
@RawRes
private fun getSideFpsAnimationForTransition(rotation: Int): Int {
when (rotation) {
Surface.ROTATION_90 -> if (context.isInRearDisplayMode()) {
return R.raw.biometricprompt_rear_portrait_reverse_base
} else if (isDeviceFolded) {
return R.raw.biometricprompt_folded_base_topleft
} else {
return R.raw.biometricprompt_portrait_base_topleft
}
Surface.ROTATION_270 -> if (context.isInRearDisplayMode()) {
return R.raw.biometricprompt_rear_portrait_base
} else if (isDeviceFolded) {
return R.raw.biometricprompt_folded_base_bottomright
} else {
return R.raw.biometricprompt_portrait_base_bottomright
}
else -> if (context.isInRearDisplayMode()) {
return R.raw.biometricprompt_rear_landscape_base
} else if (isDeviceFolded) {
return R.raw.biometricprompt_folded_base_default
} else {
return R.raw.biometricprompt_landscape_base
}
private fun getSideFpsAnimationForTransition(rotation: Int): Int = when (rotation) {
Surface.ROTATION_90 -> if (isDeviceFolded) {
R.raw.biometricprompt_folded_base_topleft
} else {
R.raw.biometricprompt_portrait_base_topleft
}
Surface.ROTATION_270 -> if (isDeviceFolded) {
R.raw.biometricprompt_folded_base_bottomright
} else {
R.raw.biometricprompt_portrait_base_bottomright
}
else -> if (isDeviceFolded) {
R.raw.biometricprompt_folded_base_default
} else {
R.raw.biometricprompt_landscape_base
}
}

8
packages/SystemUI/src/com/android/systemui/biometrics/SideFpsController.kt
View File

@@ -173,16 +173,12 @@ constructor(
override fun show(
sensorId: Int,
@BiometricOverlayConstants.ShowReason reason: Int
) {
if (
reason.isReasonToAutoShow(activityTaskManager) &&
!context.isInRearDisplayMode()
) {
) =
if (reason.isReasonToAutoShow(activityTaskManager)) {
show(SideFpsUiRequestSource.AUTO_SHOW, reason)
} else {
hide(SideFpsUiRequestSource.AUTO_SHOW)
}
}
override fun hide(sensorId: Int) = hide(SideFpsUiRequestSource.AUTO_SHOW)
}

6
packages/SystemUI/src/com/android/systemui/biometrics/Utils.kt
View File

@@ -36,7 +36,6 @@ import android.view.WindowManager
import android.view.accessibility.AccessibilityEvent
import android.view.accessibility.AccessibilityManager
import com.android.internal.widget.LockPatternUtils
import com.android.systemui.R
import java.lang.annotation.Retention
import java.lang.annotation.RetentionPolicy
@@ -118,7 +117,4 @@ object Utils {
@Retention(RetentionPolicy.SOURCE)
@IntDef(CREDENTIAL_PIN, CREDENTIAL_PATTERN, CREDENTIAL_PASSWORD)
internal annotation class CredentialType
}
fun Context.isInRearDisplayMode(): Boolean = resources.getIntArray(
com.android.internal.R.array.config_rearDisplayDeviceStates).isNotEmpty()
}

216
packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthBiometricFingerprintViewTest.kt
View File

@@ -15,49 +15,27 @@
*/
package com.android.systemui.biometrics
import android.content.Context
import android.hardware.biometrics.BiometricAuthenticator
import android.hardware.biometrics.SensorLocationInternal
import android.hardware.biometrics.SensorProperties
import android.hardware.display.DisplayManagerGlobal
import android.hardware.fingerprint.FingerprintManager
import android.hardware.fingerprint.FingerprintSensorProperties
import android.hardware.fingerprint.FingerprintSensorPropertiesInternal
import android.os.Bundle
import android.testing.AndroidTestingRunner
import android.testing.TestableLooper
import android.testing.TestableLooper.RunWithLooper
import android.view.Display
import android.view.DisplayAdjustments
import android.view.DisplayInfo
import android.view.Surface
import android.view.View
import android.view.ViewGroup
import androidx.test.filters.SmallTest
import com.airbnb.lottie.LottieAnimationView
import com.android.systemui.R
import com.android.systemui.biometrics.AuthBiometricView.STATE_AUTHENTICATING_ANIMATING_IN
import com.android.systemui.SysuiTestCase
import com.android.systemui.SysuiTestableContext
import com.google.common.truth.Truth.assertThat
import org.junit.After
import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.ArgumentCaptor
import org.mockito.ArgumentMatchers
import org.mockito.ArgumentMatchers.eq
import org.mockito.Mock
import org.mockito.Mockito.mock
import org.mockito.Mockito.never
import org.mockito.Mockito.times
import org.mockito.Mockito.verify
import org.mockito.junit.MockitoJUnit
import org.mockito.Mockito.`when` as whenEver
private const val DISPLAY_ID = 2
private const val SENSOR_ID = 1
@RunWith(AndroidTestingRunner::class)
@RunWithLooper(setAsMainLooper = true)
@@ -71,23 +49,10 @@ class AuthBiometricFingerprintViewTest : SysuiTestCase() {
@Mock
private lateinit var callback: AuthBiometricView.Callback
@Mock
private lateinit var fingerprintManager: FingerprintManager
@Mock
private lateinit var iconView: LottieAnimationView
@Mock
private lateinit var iconViewOverlay: LottieAnimationView
@Mock
private lateinit var iconLayoutParamSize: Pair<Int, Int>
@Mock
private lateinit var panelController: AuthPanelController
private lateinit var biometricView: AuthBiometricView
private lateinit var iconController: AuthBiometricFingerprintIconController
private fun createView(allowDeviceCredential: Boolean = false): AuthBiometricFingerprintView {
val view: AuthBiometricFingerprintView =
@@ -312,186 +277,5 @@ class AuthBiometricFingerprintViewTest : SysuiTestCase() {
verify(callback).onAction(AuthBiometricView.Callback.ACTION_USE_DEVICE_CREDENTIAL)
}
private fun testWithSfpsDisplay(
isReverseDefaultRotation: Boolean = false,
inRearDisplayMode: Boolean = false,
isFolded: Boolean = false,
initInfo: DisplayInfo.() -> Unit = {},
block: () -> Unit
) {
val displayInfo = DisplayInfo()
displayInfo.initInfo()
val dmGlobal = mock(DisplayManagerGlobal::class.java)
val display = Display(dmGlobal, DISPLAY_ID, displayInfo,
DisplayAdjustments.DEFAULT_DISPLAY_ADJUSTMENTS)
whenEver(dmGlobal.getDisplayInfo(eq(DISPLAY_ID))).thenReturn(displayInfo)
val iconControllerContext = context.createDisplayContext(display) as SysuiTestableContext
iconControllerContext.orCreateTestableResources.addOverride(
com.android.internal.R.bool.config_reverseDefaultRotation,
isReverseDefaultRotation
)
val rearDisplayDeviceStates = if (inRearDisplayMode) intArrayOf(3) else intArrayOf()
iconControllerContext.orCreateTestableResources.addOverride(
com.android.internal.R.array.config_rearDisplayDeviceStates,
rearDisplayDeviceStates
)
val layoutParams = mock(ViewGroup.LayoutParams::class.java)
whenEver(iconView.layoutParams).thenReturn(layoutParams)
whenEver(iconViewOverlay.layoutParams).thenReturn(layoutParams)
var locations = listOf(SensorLocationInternal("", 2500, 0, 0))
whenEver(fingerprintManager.sensorPropertiesInternal)
.thenReturn(
listOf(
FingerprintSensorPropertiesInternal(
SENSOR_ID,
SensorProperties.STRENGTH_STRONG,
5 /* maxEnrollmentsPerUser */,
listOf() /* componentInfo */,
FingerprintSensorProperties.TYPE_POWER_BUTTON,
true /* halControlsIllumination */,
true /* resetLockoutRequiresHardwareAuthToken */,
locations
)
)
)
iconControllerContext.addMockSystemService(Context.FINGERPRINT_SERVICE, fingerprintManager)
iconController = AuthBiometricFingerprintIconController(
iconControllerContext,
iconView,
iconViewOverlay
)
iconController.onFoldUpdated(isFolded)
biometricView.mIconController = iconController
block()
}
@Test
fun sfpsRearDisplay_showsCorrectAnimationAssetsAcrossRotations() {
testWithSfpsDisplay(
isReverseDefaultRotation = false,
inRearDisplayMode = true,
isFolded = false,
{ rotation = Surface.ROTATION_0 }
) { biometricView.updateState(STATE_AUTHENTICATING_ANIMATING_IN) }
testWithSfpsDisplay(
isReverseDefaultRotation = false,
inRearDisplayMode = true,
isFolded = false,
{ rotation = Surface.ROTATION_90 }
) { biometricView.updateState(STATE_AUTHENTICATING_ANIMATING_IN) }
testWithSfpsDisplay(
isReverseDefaultRotation = false,
inRearDisplayMode = true,
isFolded = false,
{ rotation = Surface.ROTATION_180 }
) { biometricView.updateState(STATE_AUTHENTICATING_ANIMATING_IN) }
testWithSfpsDisplay(
isReverseDefaultRotation = false,
inRearDisplayMode = true,
isFolded = false,
{ rotation = Surface.ROTATION_270 }
) { biometricView.updateState(STATE_AUTHENTICATING_ANIMATING_IN) }
val expectedLottieAssetOrder: List<Int> = listOf(
R.raw.biometricprompt_rear_landscape_base,
R.raw.biometricprompt_rear_portrait_reverse_base,
R.raw.biometricprompt_rear_landscape_base,
R.raw.biometricprompt_rear_portrait_base,
)
val lottieAssetCaptor: ArgumentCaptor<Int> = ArgumentCaptor.forClass(Int::class.java)
verify(iconView, times(4)).setAnimation(lottieAssetCaptor.capture())
val observedLottieAssetOrder: List<Int> = lottieAssetCaptor.getAllValues()
assertThat(observedLottieAssetOrder).containsExactlyElementsIn(expectedLottieAssetOrder)
.inOrder()
}
@Test
fun sfpsDefaultDisplayFolded_showsAnimationsAssetsCorrectlyAcrossRotations() {
testWithSfpsDisplay(
isReverseDefaultRotation = false,
inRearDisplayMode = false,
isFolded = true,
{ rotation = Surface.ROTATION_0 }
) { biometricView.updateState(STATE_AUTHENTICATING_ANIMATING_IN) }
testWithSfpsDisplay(
isReverseDefaultRotation = false,
inRearDisplayMode = false,
isFolded = true,
{ rotation = Surface.ROTATION_90 }
) { biometricView.updateState(STATE_AUTHENTICATING_ANIMATING_IN); }
testWithSfpsDisplay(
isReverseDefaultRotation = false,
inRearDisplayMode = false,
isFolded = true,
{ rotation = Surface.ROTATION_180 }
) { biometricView.updateState(STATE_AUTHENTICATING_ANIMATING_IN); }
testWithSfpsDisplay(
isReverseDefaultRotation = false,
inRearDisplayMode = false,
isFolded = true,
{ rotation = Surface.ROTATION_270 }
) { biometricView.updateState(STATE_AUTHENTICATING_ANIMATING_IN); }
val expectedLottieAssetOrder: List<Int> = listOf(
R.raw.biometricprompt_folded_base_default,
R.raw.biometricprompt_folded_base_topleft,
R.raw.biometricprompt_folded_base_default,
R.raw.biometricprompt_folded_base_bottomright,
)
val lottieAssetCaptor: ArgumentCaptor<Int> = ArgumentCaptor.forClass(Int::class.java)
verify(iconView, times(4)).setAnimation(lottieAssetCaptor.capture())
val observedLottieAssetOrder: List<Int> = lottieAssetCaptor.getAllValues()
assertThat(observedLottieAssetOrder).containsExactlyElementsIn(expectedLottieAssetOrder)
.inOrder()
}
@Test
fun sfpsDefaultDisplayUnfolded_showsAnimationsAssetsCorrectlyAcrossRotations() {
testWithSfpsDisplay(
isReverseDefaultRotation = false,
inRearDisplayMode = false,
isFolded = false,
{ rotation = Surface.ROTATION_0 }
) { biometricView.updateState(STATE_AUTHENTICATING_ANIMATING_IN) }
testWithSfpsDisplay(
isReverseDefaultRotation = false,
inRearDisplayMode = false,
isFolded = false,
{ rotation = Surface.ROTATION_90 }
) { biometricView.updateState(STATE_AUTHENTICATING_ANIMATING_IN) }
testWithSfpsDisplay(
isReverseDefaultRotation = false,
inRearDisplayMode = false,
isFolded = false,
{ rotation = Surface.ROTATION_180 }
) { biometricView.updateState(STATE_AUTHENTICATING_ANIMATING_IN) }
testWithSfpsDisplay(
isReverseDefaultRotation = false,
inRearDisplayMode = false,
isFolded = false,
{ rotation = Surface.ROTATION_270 }
) { biometricView.updateState(STATE_AUTHENTICATING_ANIMATING_IN) }
val expectedLottieAssetOrder: List<Int> = listOf(
R.raw.biometricprompt_landscape_base,
R.raw.biometricprompt_portrait_base_topleft,
R.raw.biometricprompt_landscape_base,
R.raw.biometricprompt_portrait_base_bottomright,
)
val lottieAssetCaptor: ArgumentCaptor<Int> = ArgumentCaptor.forClass(Int::class.java)
verify(iconView, times(4)).setAnimation(lottieAssetCaptor.capture())
val observedLottieAssetOrder: List<Int> = lottieAssetCaptor.getAllValues()
assertThat(observedLottieAssetOrder).containsExactlyElementsIn(expectedLottieAssetOrder)
.inOrder()
}
override fun waitForIdleSync() = TestableLooper.get(this).processAllMessages()
}

65
packages/SystemUI/tests/src/com/android/systemui/biometrics/SideFpsControllerTest.kt
View File

@@ -172,7 +172,6 @@ class SideFpsControllerTest : SysuiTestCase() {
isReverseDefaultRotation: Boolean = false,
initInfo: DisplayInfo.() -> Unit = {},
windowInsets: WindowInsets = insetsForSmallNavbar(),
inRearDisplayMode: Boolean = false,
block: () -> Unit
) {
this.deviceConfig = deviceConfig
@@ -233,12 +232,6 @@ class SideFpsControllerTest : SysuiTestCase() {
isReverseDefaultRotation
)
val rearDisplayDeviceStates = if (inRearDisplayMode) intArrayOf(3) else intArrayOf()
sideFpsControllerContext.orCreateTestableResources.addOverride(
com.android.internal.R.array.config_rearDisplayDeviceStates,
rearDisplayDeviceStates
)
sideFpsController =
SideFpsController(
sideFpsControllerContext,
@@ -596,62 +589,10 @@ class SideFpsControllerTest : SysuiTestCase() {
verifySfpsIndicatorVisibilityOnTaskbarUpdate(sfpsViewVisible = true)
}
@Test
fun verifiesSfpsIndicatorNotAddedInRearDisplayMode_0() =
testWithDisplay(
deviceConfig = DeviceConfig.Y_ALIGNED,
isReverseDefaultRotation = false,
{ rotation = Surface.ROTATION_0 },
inRearDisplayMode = true,
) {
verifySfpsIndicator_notAdded_InRearDisplayMode()
}
@Test
fun verifiesSfpsIndicatorNotAddedInRearDisplayMode_90() =
testWithDisplay(
deviceConfig = DeviceConfig.Y_ALIGNED,
isReverseDefaultRotation = false,
{ rotation = Surface.ROTATION_90 },
inRearDisplayMode = true,
) {
verifySfpsIndicator_notAdded_InRearDisplayMode()
}
@Test
fun verifiesSfpsIndicatorNotAddedInRearDisplayMode_180() =
testWithDisplay(
deviceConfig = DeviceConfig.Y_ALIGNED,
isReverseDefaultRotation = false,
{ rotation = Surface.ROTATION_180 },
inRearDisplayMode = true,
) {
verifySfpsIndicator_notAdded_InRearDisplayMode()
}
@Test
fun verifiesSfpsIndicatorNotAddedInRearDisplayMode_270() =
testWithDisplay(
deviceConfig = DeviceConfig.Y_ALIGNED,
isReverseDefaultRotation = false,
{ rotation = Surface.ROTATION_270 },
inRearDisplayMode = true,
) {
verifySfpsIndicator_notAdded_InRearDisplayMode()
}
private fun verifySfpsIndicatorVisibilityOnTaskbarUpdate(sfpsViewVisible: Boolean) {
sideFpsController.overlayOffsets = sensorLocation
}
private fun verifySfpsIndicator_notAdded_InRearDisplayMode() {
sideFpsController.overlayOffsets = sensorLocation
overlayController.show(SENSOR_ID, REASON_UNKNOWN)
executor.runAllReady()
verify(windowManager, never()).addView(any(), any())
}
fun alternateBouncerVisibility_showAndHideSideFpsUI() = testWithDisplay {
// WHEN alternate bouncer is visible
keyguardBouncerRepository.setAlternateVisible(true)
@@ -688,7 +629,7 @@ class SideFpsControllerTest : SysuiTestCase() {
* in other rotations have been omitted.
*/
@Test
fun verifiesIndicatorPlacementForXAlignedSensor_0() =
fun verifiesIndicatorPlacementForXAlignedSensor_0() {
testWithDisplay(
deviceConfig = DeviceConfig.X_ALIGNED,
isReverseDefaultRotation = false,
@@ -705,6 +646,7 @@ class SideFpsControllerTest : SysuiTestCase() {
assertThat(overlayViewParamsCaptor.value.x).isEqualTo(sensorLocation.sensorLocationX)
assertThat(overlayViewParamsCaptor.value.y).isEqualTo(0)
}
}
/**
* {@link SideFpsController#updateOverlayParams} calculates indicator placement for ROTATION_270
@@ -713,7 +655,7 @@ class SideFpsControllerTest : SysuiTestCase() {
* correctly, tests for indicator placement in other rotations have been omitted.
*/
@Test
fun verifiesIndicatorPlacementForXAlignedSensor_InReverseDefaultRotation_270() =
fun verifiesIndicatorPlacementForXAlignedSensor_InReverseDefaultRotation_270() {
testWithDisplay(
deviceConfig = DeviceConfig.X_ALIGNED,
isReverseDefaultRotation = true,
@@ -730,6 +672,7 @@ class SideFpsControllerTest : SysuiTestCase() {
assertThat(overlayViewParamsCaptor.value.x).isEqualTo(sensorLocation.sensorLocationX)
assertThat(overlayViewParamsCaptor.value.y).isEqualTo(0)
}
}
/**
* {@link SideFpsController#updateOverlayParams} calculates indicator placement for ROTATION_0,