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

Update Face Unlock strings to the latest versions

Browse Source 
Makes the following changes to strings related to Face Unlock:
- Standardize capitalization of "Face Unlock"
- Use latest versions of traffic light face enroll strings
- Use latest versions of combined biometrics settings strings
- Set SUW description strings programmatically instead of in XML

Test: Manually tested Face Unlock traffic light and grid UIs

Bug: 183649070
Change-Id: Ie67978ae2630493a5b03b00c3f8a639066ab8f3a
This commit is contained in:
Curtis Belmonte
2021-05-14 15:54:56 -07:00
parent c96c5c68d9
commit 47d74ccfd7
8 changed files with 305 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java
View File

@@ -82,11 +82,10 @@ public class SetupSkipDialogTest {
AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(alertDialog).isNotNull();
ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(alertDialog);
assertThat(mActivity.getString(R.string.lock_screen_pin_skip_title)).isEqualTo(
shadowAlertDialog.getTitle());
assertThat(getSkipDialogMessage(false, true, false))
.isEqualTo(shadowAlertDialog.getMessage());
assertThat(shadowAlertDialog.getTitle()).isEqualTo(
mActivity.getString(R.string.lock_screen_pin_skip_biometrics_title));
assertThat(shadowAlertDialog.getMessage()).isEqualTo(
mActivity.getString(R.string.lock_screen_pin_skip_biometrics_message));
}
@Test
@@ -98,11 +97,10 @@ public class SetupSkipDialogTest {
AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(alertDialog).isNotNull();
ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(alertDialog);
assertThat(mActivity.getString(R.string.lock_screen_password_skip_title)).isEqualTo(
shadowAlertDialog.getTitle());
assertThat(getSkipDialogMessage(false, true, false))
.isEqualTo(shadowAlertDialog.getMessage());
assertThat(shadowAlertDialog.getTitle()).isEqualTo(
mActivity.getString(R.string.lock_screen_password_skip_face_title));
assertThat(shadowAlertDialog.getMessage()).isEqualTo(
mActivity.getString(R.string.lock_screen_password_skip_face_message));
}
@Test
@@ -114,11 +112,10 @@ public class SetupSkipDialogTest {
AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(alertDialog).isNotNull();
ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(alertDialog);
assertThat(mActivity.getString(R.string.lock_screen_pattern_skip_title)).isEqualTo(
shadowAlertDialog.getTitle());
assertThat(getSkipDialogMessage(false, true, false))
.isEqualTo(shadowAlertDialog.getMessage());
assertThat(shadowAlertDialog.getTitle()).isEqualTo(
mActivity.getString(R.string.lock_screen_pattern_skip_face_title));
assertThat(shadowAlertDialog.getMessage()).isEqualTo(
mActivity.getString(R.string.lock_screen_pattern_skip_face_message));
}
@Test
@@ -130,11 +127,10 @@ public class SetupSkipDialogTest {
AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(alertDialog).isNotNull();
ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(alertDialog);
assertThat(mActivity.getString(R.string.lock_screen_pin_skip_title)).isEqualTo(
shadowAlertDialog.getTitle());
assertThat(getSkipDialogMessage(true, false, false))
.isEqualTo(shadowAlertDialog.getMessage());
assertThat(shadowAlertDialog.getTitle()).isEqualTo(
mActivity.getString(R.string.lock_screen_pin_skip_fingerprint_title));
assertThat(shadowAlertDialog.getMessage()).isEqualTo(
mActivity.getString(R.string.lock_screen_pin_skip_fingerprint_message));
}
@Test
@@ -146,11 +142,10 @@ public class SetupSkipDialogTest {
AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(alertDialog).isNotNull();
ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(alertDialog);
assertThat(mActivity.getString(R.string.lock_screen_password_skip_title)).isEqualTo(
shadowAlertDialog.getTitle());
assertThat(getSkipDialogMessage(true, false, false))
.isEqualTo(shadowAlertDialog.getMessage());
assertThat(shadowAlertDialog.getTitle()).isEqualTo(
mActivity.getString(R.string.lock_screen_password_skip_fingerprint_title));
assertThat(shadowAlertDialog.getMessage()).isEqualTo(
mActivity.getString(R.string.lock_screen_password_skip_fingerprint_message));
}
@Test
@@ -162,11 +157,10 @@ public class SetupSkipDialogTest {
AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(alertDialog).isNotNull();
ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(alertDialog);
assertThat(mActivity.getString(R.string.lock_screen_pattern_skip_title)).isEqualTo(
shadowAlertDialog.getTitle());
assertThat(getSkipDialogMessage(true, false, false))
.isEqualTo(shadowAlertDialog.getMessage());
assertThat(shadowAlertDialog.getTitle()).isEqualTo(
mActivity.getString(R.string.lock_screen_pattern_skip_fingerprint_title));
assertThat(shadowAlertDialog.getMessage()).isEqualTo(
mActivity.getString(R.string.lock_screen_pattern_skip_fingerprint_message));
}
@@ -179,11 +173,10 @@ public class SetupSkipDialogTest {
AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(alertDialog).isNotNull();
ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(alertDialog);
assertThat(mActivity.getString(R.string.lock_screen_pin_skip_title)).isEqualTo(
shadowAlertDialog.getTitle());
assertThat(getSkipDialogMessage(false, false, true))
.isEqualTo(shadowAlertDialog.getMessage());
assertThat(shadowAlertDialog.getTitle()).isEqualTo(
mActivity.getString(R.string.lock_screen_pin_skip_biometrics_title));
assertThat(shadowAlertDialog.getMessage()).isEqualTo(
mActivity.getString(R.string.lock_screen_pin_skip_biometrics_message));
}
@Test
@@ -195,11 +188,10 @@ public class SetupSkipDialogTest {
AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(alertDialog).isNotNull();
ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(alertDialog);
assertThat(mActivity.getString(R.string.lock_screen_password_skip_title)).isEqualTo(
shadowAlertDialog.getTitle());
assertThat(getSkipDialogMessage(false, false, true))
.isEqualTo(shadowAlertDialog.getMessage());
assertThat(shadowAlertDialog.getTitle()).isEqualTo(
mActivity.getString(R.string.lock_screen_password_skip_biometrics_title));
assertThat(shadowAlertDialog.getMessage()).isEqualTo(
mActivity.getString(R.string.lock_screen_password_skip_biometrics_message));
}
@Test
@@ -211,25 +203,9 @@ public class SetupSkipDialogTest {
AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(alertDialog).isNotNull();
ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(alertDialog);
assertThat(mActivity.getString(R.string.lock_screen_pattern_skip_title)).isEqualTo(
shadowAlertDialog.getTitle());
assertThat(getSkipDialogMessage(false, false, true))
.isEqualTo(shadowAlertDialog.getMessage());
}
public String getSkipDialogMessage(boolean forFingerprint, boolean forFace,
boolean forBiometrics) {
final int resId;
if (forFingerprint) {
resId = R.string.fingerprint_lock_screen_setup_skip_dialog_text;
} else if (forFace) {
resId = R.string.face_lock_screen_setup_skip_dialog_text;
} else if (forBiometrics) {
resId = R.string.biometrics_lock_screen_setup_skip_dialog_text;
} else {
return null;
}
return String.format(mActivity.getString(resId));
assertThat(shadowAlertDialog.getTitle()).isEqualTo(
mActivity.getString(R.string.lock_screen_pattern_skip_biometrics_title));
assertThat(shadowAlertDialog.getMessage()).isEqualTo(
mActivity.getString(R.string.lock_screen_pattern_skip_biometrics_message));
}
}