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

Merge "Update settings together with frameworks/base"

Browse Source
This commit is contained in:
Kevin Chyn
2020-08-19 22:33:04 +00:00
committed by Android (Google) Code Review
parent dcd910ed06 202494365c
commit 54a5f51dba
20 changed files with 130 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
View File

@@ -110,12 +110,13 @@ public class ChooseLockPasswordTest {
@Test
public void intentBuilder_setRequestGatekeeperPassword_shouldAddExtras() {
Intent intent = new IntentBuilder(application)
.setRequestGatekeeperPassword(true)
.setRequestGatekeeperPasswordHandle(true)
.setPasswordQuality(PASSWORD_QUALITY_ALPHANUMERIC)
.setUserId(123)
.build();
assertThat(intent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW, false))
assertThat(intent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE,
false))
.named("EXTRA_KEY_REQUEST_GK_PW")
.isTrue();
assertThat(intent.getIntExtra(PASSWORD_TYPE_KEY, 0))

4
tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
View File

@@ -74,12 +74,12 @@ public class ChooseLockPatternTest {
@Test
public void intentBuilder_setRequestGatekeeperPassword_shouldAddExtras() {
Intent intent = new IntentBuilder(application)
.setRequestGatekeeperPassword(true)
.setRequestGatekeeperPasswordHandle(true)
.setUserId(123)
.build();
assertThat(intent
.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW, false))
.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, false))
.named("EXTRA_KEY_REQUEST_GK_PW")
.isTrue();
assertThat(intent

6
tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
View File

@@ -23,7 +23,7 @@ import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericF
import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY;
import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_FOR_FACE;
import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT;
import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW;
import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE;
import static com.google.common.truth.Truth.assertThat;
@@ -270,7 +270,7 @@ public final class SetNewPasswordControllerTest {
actualBundle.getBoolean(HIDE_DISABLED_PREFS));
assertTrue(
"Fingerprint enroll must request Gatekeeper Password.",
actualBundle.getBoolean(EXTRA_KEY_REQUEST_GK_PW));
actualBundle.getBoolean(EXTRA_KEY_REQUEST_GK_PW_HANDLE));
assertTrue(
"The request must be a fingerprint set up request.",
actualBundle.getBoolean(EXTRA_KEY_FOR_FINGERPRINT));
@@ -290,7 +290,7 @@ public final class SetNewPasswordControllerTest {
actualBundle.getBoolean(HIDE_DISABLED_PREFS));
assertTrue(
"Face enroll must request Gatekeeper Password",
actualBundle.getBoolean(EXTRA_KEY_REQUEST_GK_PW));
actualBundle.getBoolean(EXTRA_KEY_REQUEST_GK_PW_HANDLE));
assertTrue(
"The request must be a face set up request.",
actualBundle.getBoolean(EXTRA_KEY_FOR_FACE));