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

Merge "Hide "no thanks" button when enrollment completed."

Browse Source
This commit is contained in:
TreeHugger Robot
2023-02-11 02:34:19 +00:00
committed by Android (Google) Code Review
parent 35def91fcc 5e3fd696a5
commit 34b7835a50
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
View File

@@ -222,7 +222,9 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
// Show secondary button once scroll is completed. // Show secondary button once scroll is completed.
if (!scrollNeeded) { if (!scrollNeeded) {
getSecondaryFooterButton().setVisibility(View.VISIBLE); if (!enrollmentCompleted) {
getSecondaryFooterButton().setVisibility(View.VISIBLE);
}
mHasScrolledToBottom = true; mHasScrolledToBottom = true;
} }
}); });
@@ -242,6 +244,7 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
mErrorText.setVisibility(View.VISIBLE); mErrorText.setVisibility(View.VISIBLE);
getNextButton().setText(getResources().getString(R.string.done)); getNextButton().setText(getResources().getString(R.string.done));
getNextButton().setVisibility(View.VISIBLE); getNextButton().setVisibility(View.VISIBLE);
getSecondaryFooterButton().setVisibility(View.INVISIBLE);
} }
} }

20
tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java
View File

@@ -44,6 +44,7 @@ import android.hardware.fingerprint.FingerprintManager;
import android.hardware.fingerprint.FingerprintSensorProperties; import android.hardware.fingerprint.FingerprintSensorProperties;
import android.hardware.fingerprint.FingerprintSensorPropertiesInternal; import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
import android.os.UserManager; import android.os.UserManager;
import android.view.View;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
@@ -54,7 +55,10 @@ import com.android.settings.R;
import com.android.settings.biometrics.GatekeeperPasswordProvider; import com.android.settings.biometrics.GatekeeperPasswordProvider;
import com.google.android.setupcompat.util.WizardManagerHelper; import com.google.android.setupcompat.util.WizardManagerHelper;
import com.google.android.setupdesign.GlifLayout;
import com.google.android.setupdesign.template.RequireScrollMixin;
import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@@ -177,6 +181,14 @@ public class FingerprintEnrollIntroductionTest {
int result = mFingerprintEnrollIntroduction.checkMaxEnrolled(); int result = mFingerprintEnrollIntroduction.checkMaxEnrolled();
assertThat(result).isEqualTo(0); assertThat(result).isEqualTo(0);
final RequireScrollMixin requireScrollMixin =
((GlifLayout) mFingerprintEnrollIntroduction.findViewById(
R.id.setup_wizard_layout)).getMixin(RequireScrollMixin.class);
requireScrollMixin.getOnRequireScrollStateChangedListener().onRequireScrollStateChanged(
false);
Assert.assertEquals(View.VISIBLE,
mFingerprintEnrollIntroduction.getSecondaryFooterButton().getVisibility());
} }
@Test @Test
@@ -192,6 +204,14 @@ public class FingerprintEnrollIntroductionTest {
int result = mFingerprintEnrollIntroduction.checkMaxEnrolled(); int result = mFingerprintEnrollIntroduction.checkMaxEnrolled();
assertThat(result).isEqualTo(R.string.fingerprint_intro_error_max); assertThat(result).isEqualTo(R.string.fingerprint_intro_error_max);
final RequireScrollMixin requireScrollMixin =
((GlifLayout) mFingerprintEnrollIntroduction.findViewById(
R.id.setup_wizard_layout)).getMixin(RequireScrollMixin.class);
requireScrollMixin.getOnRequireScrollStateChangedListener().onRequireScrollStateChanged(
false);
Assert.assertEquals(View.INVISIBLE,
mFingerprintEnrollIntroduction.getSecondaryFooterButton().getVisibility());
} }
@Test @Test