PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Removed subtext from side fps enrollment flow" into udc-dev am: 36e41dc985 am: 4f9d82de86

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673465

Change-Id: I4f4ea29ca7080f143bc7772424c8aadaa8162d8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Diya Bera
2023-03-02 17:59:52 +00:00
committed by Automerger Merge Worker
parent 9bc3bd1b34 4f9d82de86
commit aacb08b441
2 changed files with 48 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
View File

@@ -55,6 +55,7 @@ import android.os.Vibrator;
import android.util.FeatureFlagUtils;
import android.view.Display;
import android.view.Surface;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.ImageView;
@@ -433,6 +434,28 @@ public class FingerprintEnrollEnrollingTest {
assertThat(appliedThemes.contains("SetupWizardPartnerResource")).isTrue();
}
@Test
public void fingerprintSfpsEnroll_descriptionTextVisibility() {
initializeActivityFor(TYPE_POWER_BUTTON);
mActivity.onEnrollmentProgressChange(1 /* steps */, 1 /* remaining */);
assertThat(getLayout().getDescriptionTextView().getVisibility()).isEqualTo(View.GONE);
}
@Test
public void fingerprintUdfpsEnroll_descriptionTextVisibility() {
initializeActivityFor(TYPE_UDFPS_OPTICAL);
mActivity.onEnrollmentProgressChange(1 /* steps */, 1 /* remaining */);
assertThat(getLayout().getDescriptionTextView().getVisibility()).isEqualTo(View.VISIBLE);
}
private GlifLayout getLayout() {
return (GlifLayout) mActivity.findViewById(R.id.setup_wizard_layout);
}
private void initializeActivityWithoutCreate(int sensorType) {
final List<ComponentInfoInternal> componentInfo = new ArrayList<>();
final FingerprintSensorPropertiesInternal prop =
@@ -465,6 +488,9 @@ public class FingerprintEnrollEnrollingTest {
doReturn(mSfpsStageThresholds[stage]).when(mActivity).getStageThresholdSteps(stage);
}
doReturn(true).when(mSidecar).isEnrolling();
ReflectionHelpers.setField(mActivity, "mCanAssumeSfps", true);
} else if (sensorType == TYPE_UDFPS_OPTICAL) {
ReflectionHelpers.setField(mActivity, "mCanAssumeUdfps", true);
}
if (sensorType == TYPE_UDFPS_OPTICAL) {