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

Merge "Update screen lock and biometrics options in order" into udc-qpr-dev am: 8ea74c3d76

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

Change-Id: Ia5ee770bc367d6dc30610dbdc4582d343a28df32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bill Lin
2023-07-14 00:01:30 +00:00
committed by Automerger Merge Worker
parent 7faa1585e7 8ea74c3d76
commit f0278e6835
3 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java
View File

@@ -60,6 +60,7 @@ import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.LockscreenCredential;
import com.android.settings.R;
import com.android.settings.biometrics.BiometricEnrollBase;
import com.android.settings.biometrics.BiometricUtils;
import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;
import com.android.settings.search.SearchFeatureProvider;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -543,29 +544,38 @@ public class ChooseLockGenericTest {
}
@Test
public void updatePreferenceText_supportBiometrics_showFaceAndFingerprint() {
public void updatePreferenceText_supportBiometrics_setScreenLockFingerprintFace_inOrder() {
ShadowStorageManager.setIsFileEncrypted(false);
final Intent intent = new Intent().putExtra(EXTRA_KEY_FOR_BIOMETRICS, true);
initActivity(intent);
final String supportFingerprint = capitalize(mActivity.getResources().getString(
R.string.security_settings_fingerprint));
final String supportFace = capitalize(mActivity.getResources().getString(
R.string.keywords_face_settings));
String pinTitle =
// The strings of golden copy
final String pinFingerprintFace = mActivity.getText(R.string.unlock_set_unlock_pin_title)
+ BiometricUtils.SEPARATOR + supportFingerprint + BiometricUtils.SEPARATOR
+ supportFace;
final String patternFingerprintFace = mActivity.getText(
R.string.unlock_set_unlock_pattern_title) + BiometricUtils.SEPARATOR
+ supportFingerprint + BiometricUtils.SEPARATOR + supportFace;
final String passwordFingerprintFace = mActivity.getText(
R.string.unlock_set_unlock_password_title) + BiometricUtils.SEPARATOR
+ supportFingerprint + BiometricUtils.SEPARATOR + supportFace;
// The strings obtain from preferences
final String pinTitle =
(String) mFragment.findPreference(ScreenLockType.PIN.preferenceKey).getTitle();
String patternTitle =
final String patternTitle =
(String) mFragment.findPreference(ScreenLockType.PATTERN.preferenceKey).getTitle();
String passwordTitle =
final String passwordTitle =
(String) mFragment.findPreference(ScreenLockType.PASSWORD.preferenceKey).getTitle();
assertThat(pinTitle).contains(supportFingerprint);
assertThat(pinTitle).contains(supportFace);
assertThat(patternTitle).contains(supportFingerprint);
assertThat(patternTitle).contains(supportFace);
assertThat(passwordTitle).contains(supportFingerprint);
assertThat(passwordTitle).contains(supportFace);
assertThat(pinTitle).isEqualTo(pinFingerprintFace);
assertThat(patternTitle).isEqualTo(patternFingerprintFace);
assertThat(passwordTitle).isEqualTo(passwordFingerprintFace);
}
@Test