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

Launch Face Settings when device enrolled face

Browse Source 
In legacy flow FaceEnrollIntroduction check maxFacesEnrolled()
then update introduction description and prevent user go to next
enroll step, the CUJ was not good to user, instead bring user
to Face Settings and let user decide the next action(Delete face or
change config) is more make sense.

As any applications could broadcast intent(android.settings.FACE_ENROLL)
to bring FaceEnrollIntroduction up, we add a check in onCreate() and check
if device has been enrolled max face, launch FaceSettingsInternalActivity.

In addition, skip to register any posture change callback when
maxFacesEnrolled() during activity onStart().

Test: atest SettingsGoogleUnitTests
Test: m -j SettingsGoogleRoboTests RunSettingsGoogleRoboTests
Test: m RunSettingsRoboTests ROBOTEST_FILTER= \
      "FaceEnrollIntroductionTest"
Test: m RunSettingsRoboTests ROBOTEST_FILTER= \
      "FingerprintEnrollIntroductionTest"
Test: Manual enrolled face, unfold device, launch Tips Security page
and click "Set up Face Unlock", device launch Face Settings insteand of
posture guidance page.

Bug: 263830403
Change-Id: Ied8b92259810f954ce6b2daaa9b87fc996ad752a
This commit is contained in:
lbill
2023-02-04 04:02:35 +00:00
committed by Milton Wu
parent 91eab671d1
commit c7dd729a43
4 changed files with 160 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
tests/robotests/src/com/android/settings/biometrics/face/FaceEnrollIntroductionTest.java
View File

@@ -51,6 +51,8 @@ import androidx.test.core.app.ApplicationProvider;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.Settings;
import com.android.settings.biometrics.BiometricEnrollBase;
import com.android.settings.biometrics.BiometricUtils;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -62,6 +64,7 @@ import com.android.settings.testutils.shadow.ShadowUtils;
import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupcompat.template.FooterButton;
import com.google.android.setupcompat.util.WizardManagerHelper;
import com.google.android.setupdesign.GlifLayout;
import com.google.android.setupdesign.view.BottomScrollView;
@@ -168,6 +171,7 @@ public class FaceEnrollIntroductionTest {
@After
public void tearDown() {
ShadowUtils.reset();
ShadowLockPatternUtils.reset();
}
private void setupActivity() {
@@ -315,7 +319,7 @@ public class FaceEnrollIntroductionTest {
}
@Test
public void testFaceEnrollEducation_hasBottomScrollView() {
public void testFaceEnrollIntroduction_hasBottomScrollView() {
setupActivity();
BottomScrollView scrollView = getGlifLayout(mActivity).findViewById(R.id.sud_scroll_view);
@@ -387,7 +391,7 @@ public class FaceEnrollIntroductionTest {
}
@Test
public void testFaceEnrollEducation_onFoldedUpdated_folded() {
public void testFaceEnrollIntroduction_onFoldedUpdated_folded() {
final Configuration newConfig = new Configuration();
newConfig.smallestScreenWidthDp = DENSITY_DEFAULT;
setupActivityForPosture();
@@ -400,4 +404,97 @@ public class FaceEnrollIntroductionTest {
assertThat(mSpyActivity.getDevicePostureState()).isEqualTo(DEVICE_POSTURE_CLOSED);
}
@Test
public void testFaceEnrollIntroduction_maxFacesEnrolled_launchFaceSettings() {
setFaceManagerToHave(1 /* numEnrollments */);
final Intent intent = new Intent();
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, new byte[0]);
mController = Robolectric.buildActivity(TestFaceEnrollIntroduction.class, intent);
mActivity = (TestFaceEnrollIntroduction) mController.get();
mActivity.mOverrideFaceManager = mFaceManager;
mController.create();
ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
final Intent nextStartedActivity = shadowActivity.getNextStartedActivity();
assertThat(nextStartedActivity).isNotNull();
assertThat(nextStartedActivity.getComponent().getClassName())
.isEqualTo(Settings.FaceSettingsInternalActivity.class.getName());
}
@Test
public void testFaceEnrollIntroduction_maxFacesEnrolled_isSuw_notLaunchFaceSettings() {
setFaceManagerToHave(1 /* numEnrollments */);
ShadowLockPatternUtils.setActivePasswordQuality(PASSWORD_QUALITY_NUMERIC);
final Intent intent = new Intent();
intent.putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true);
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, new byte[0]);
mController = Robolectric.buildActivity(TestFaceEnrollIntroduction.class, intent);
mActivity = (TestFaceEnrollIntroduction) mController.get();
mActivity.mOverrideFaceManager = mFaceManager;
mController.create();
ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
final Intent nextStartedActivity = shadowActivity.getNextStartedActivity();
assertThat(nextStartedActivity).isNull();
}
@Test
public void testFaceEnrollIntroduction_maxFacesEnrolled_fromSettings_notLaunchFaceSettings() {
setFaceManagerToHave(1 /* numEnrollments */);
ShadowLockPatternUtils.setActivePasswordQuality(PASSWORD_QUALITY_NUMERIC);
final Intent intent = new Intent();
intent.putExtra(BiometricEnrollBase.EXTRA_FROM_SETTINGS_SUMMARY, true);
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, new byte[0]);
mController = Robolectric.buildActivity(TestFaceEnrollIntroduction.class, intent);
mActivity = (TestFaceEnrollIntroduction) mController.get();
mActivity.mOverrideFaceManager = mFaceManager;
mController.create();
ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
final Intent nextStartedActivity = shadowActivity.getNextStartedActivity();
assertThat(nextStartedActivity).isNull();
}
@Test
public void testFaceEnrollIntroduction_hasPostureCallback() {
when(mFakeFeatureFactory.mFaceFeatureProvider.getPostureGuidanceIntent(any()))
.thenReturn(new Intent());
setFaceManagerToHave(0 /* numEnrollments */);
ShadowLockPatternUtils.setActivePasswordQuality(PASSWORD_QUALITY_NUMERIC);
final Intent intent = new Intent();
intent.putExtra(BiometricEnrollBase.EXTRA_FROM_SETTINGS_SUMMARY, true);
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, new byte[0]);
mController = Robolectric.buildActivity(TestFaceEnrollIntroduction.class, intent);
mActivity = (TestFaceEnrollIntroduction) mController.get();
mActivity.mOverrideFaceManager = mFaceManager;
mController.create();
mController.start();
assertThat(mActivity.getPostureCallback()).isNotNull();
}
@Test
public void testFaceEnrollIntroduction_maxFacesEnrolled_noPostureCallback() {
when(mFakeFeatureFactory.mFaceFeatureProvider.getPostureGuidanceIntent(any()))
.thenReturn(new Intent());
setFaceManagerToHave(1 /* numEnrollments */);
ShadowLockPatternUtils.setActivePasswordQuality(PASSWORD_QUALITY_NUMERIC);
final Intent intent = new Intent();
intent.putExtra(BiometricEnrollBase.EXTRA_FROM_SETTINGS_SUMMARY, true);
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, new byte[0]);
mController = Robolectric.buildActivity(TestFaceEnrollIntroduction.class, intent);
mActivity = (TestFaceEnrollIntroduction) mController.get();
mActivity.mOverrideFaceManager = mFaceManager;
mController.create();
mController.start();
assertThat(mActivity.getPostureCallback()).isNull();
}
}

12
tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java
View File

@@ -36,6 +36,7 @@ import java.util.Map;
public class ShadowLockPatternUtils {
private static boolean sDeviceEncryptionEnabled;
private static Map<Integer, Integer> sUserToActivePasswordQualityMap = new HashMap<>();
private static Map<Integer, Integer> sUserToComplexityMap = new HashMap<>();
private static Map<Integer, Integer> sUserToProfileComplexityMap = new HashMap<>();
private static Map<Integer, PasswordMetrics> sUserToMetricsMap = new HashMap<>();
@@ -44,6 +45,7 @@ public class ShadowLockPatternUtils {
@Resetter
public static void reset() {
sUserToActivePasswordQualityMap.clear();
sUserToComplexityMap.clear();
sUserToProfileComplexityMap.clear();
sUserToMetricsMap.clear();
@@ -72,7 +74,11 @@ public class ShadowLockPatternUtils {
@Implementation
protected int getActivePasswordQuality(int userId) {
return DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
final Integer activePasswordQuality = sUserToActivePasswordQualityMap.get(userId);
if (activePasswordQuality == null) {
return DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
}
return activePasswordQuality;
}
@Implementation
@@ -153,6 +159,10 @@ public class ShadowLockPatternUtils {
sUserToProfileMetricsMap.put(UserHandle.myUserId(), metrics);
}
public static void setActivePasswordQuality(int quality) {
sUserToActivePasswordQualityMap.put(UserHandle.myUserId(), quality);
}
@Implementation
public boolean isLockScreenDisabled(int userId) {
return false;