Wait for systemui udfps overlay ready to show settings udfps enroll view.

Previously, we show settings's udfps enroll animation view (the fingerprint icon and progress view) once the FingerprintEnrollEnrolling is shown.
However, touch events have to wait for systemui's udfps overlay to be valid. This CL lets settings's udfps enroll view wait for systemui's overlay.
1. Sets udfps enroll animation view's default visibility Gone.
2. Propagates FingerprintManager#onUdfpsOverlayShown to
   FingerprintEnrollEnrolling and when it's called, set the enroll view
   visible.

Besides, this CL renames onPointerDown() and onPointerUp() with Udfps.

Bug: 280718879
Test: atest FingerprintEnrollEnrollingTest
Change-Id: Ieed3e74c182828918785edcacb021f19a3665f2a
This commit is contained in:
Hao Dong
2023-06-07 00:02:48 +00:00
parent 3c67940884
commit be823bc598
9 changed files with 320 additions and 33 deletions

View File

@@ -339,6 +339,19 @@ public class FingerprintEnrollEnrollingTest {
assertThat(descriptionTextView.getVisibility()).isEqualTo(View.VISIBLE);
}
@Test
public void fingerprintUdfpsOverlayEnrollment_udfpsAnimationViewVisibility() {
initializeActivityWithoutCreate(TYPE_UDFPS_OPTICAL);
when(mMockDisplay.getRotation()).thenReturn(Surface.ROTATION_0);
createActivity();
final UdfpsEnrollView enrollView = mActivity.findViewById(R.id.udfps_animation_view);
assertThat(enrollView.getVisibility()).isEqualTo(View.GONE);
mActivity.onUdfpsOverlayShown();
assertThat(enrollView.getVisibility()).isEqualTo(View.VISIBLE);
}
@Test
public void forwardEnrollProgressEvents() {
initializeActivityFor(TYPE_UDFPS_OPTICAL);
@@ -380,11 +393,11 @@ public class FingerprintEnrollEnrollingTest {
}
@Test
public void forwardEnrollPointerDownEvents() {
public void forwardUdfpsEnrollPointerDownEvents() {
initializeActivityFor(TYPE_UDFPS_OPTICAL);
EnrollListener listener = new EnrollListener(mActivity);
mActivity.onPointerDown(0);
mActivity.onUdfpsPointerDown(0);
assertThat(listener.mProgress).isFalse();
assertThat(listener.mHelp).isFalse();
assertThat(listener.mAcquired).isFalse();
@@ -393,11 +406,11 @@ public class FingerprintEnrollEnrollingTest {
}
@Test
public void forwardEnrollPointerUpEvents() {
public void forwardUdfpsEnrollPointerUpEvents() {
initializeActivityFor(TYPE_UDFPS_OPTICAL);
EnrollListener listener = new EnrollListener(mActivity);
mActivity.onPointerUp(0);
mActivity.onUdfpsPointerUp(0);
assertThat(listener.mProgress).isFalse();
assertThat(listener.mHelp).isFalse();
assertThat(listener.mAcquired).isFalse();