diff --git a/res/layout/setup_choose_lock_generic_biometrics_header.xml b/res/layout/setup_choose_lock_generic_biometrics_header.xml deleted file mode 100644 index daeeedd845d..00000000000 --- a/res/layout/setup_choose_lock_generic_biometrics_header.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - diff --git a/res/layout/setup_choose_lock_generic_header.xml b/res/layout/setup_choose_lock_generic_header.xml deleted file mode 100644 index 7ec16d2c420..00000000000 --- a/res/layout/setup_choose_lock_generic_header.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - diff --git a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java index 730e0496774..cdd2d8b88d9 100644 --- a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java @@ -183,7 +183,9 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase mUserManager = UserManager.get(this); updatePasswordQuality(); - if (!mConfirmingCredentials) { + // Check isFinishing() because FaceEnrollIntroduction may finish self to launch + // FaceSettings during onCreate() + if (!mConfirmingCredentials && !isFinishing()) { if (!mHasPassword) { // No password registered, launch into enrollment wizard. mConfirmingCredentials = true; diff --git a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java index a1233086926..66ed56afc96 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java @@ -28,6 +28,7 @@ import android.hardware.SensorPrivacyManager; import android.hardware.biometrics.BiometricAuthenticator; import android.hardware.face.FaceManager; import android.os.Bundle; +import android.os.UserHandle; import android.text.Html; import android.text.method.LinkMovementMethod; import android.util.Log; @@ -42,6 +43,7 @@ import androidx.annotation.StringRes; import androidx.annotation.VisibleForTesting; import com.android.settings.R; +import com.android.settings.Settings; import com.android.settings.Utils; import com.android.settings.biometrics.BiometricEnrollActivity; import com.android.settings.biometrics.BiometricEnrollIntroduction; @@ -110,8 +112,26 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction { @Override protected void onCreate(Bundle savedInstanceState) { + mFaceManager = getFaceManager(); + + if (savedInstanceState == null + && !WizardManagerHelper.isAnySetupWizard(getIntent()) + && !getIntent().getBooleanExtra(EXTRA_FROM_SETTINGS_SUMMARY, false) + && maxFacesEnrolled()) { + // from tips && maxEnrolled + Log.d(TAG, "launch face settings"); + launchFaceSettingsActivity(); + finish(); + } + super.onCreate(savedInstanceState); + // Wait super::onCreated() then return because SuperNotCalledExceptio will be thrown + // if we don't wait for it. + if (isFinishing()) { + return; + } + // Apply extracted theme color to icons. final ImageView iconGlasses = findViewById(R.id.icon_glasses); final ImageView iconLooking = findViewById(R.id.icon_looking); @@ -152,8 +172,6 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction { infoMessageRequireEyes.setText(getInfoMessageRequireEyes()); } - mFaceManager = getFaceManager(); - // This path is an entry point for SetNewPasswordController, e.g. // adb shell am start -a android.app.action.SET_NEW_PASSWORD if (mToken == null && BiometricUtils.containsGatekeeperPasswordHandle(getIntent())) { @@ -191,6 +209,24 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction { Log.v(TAG, "cameraPrivacyEnabled : " + cameraPrivacyEnabled); } + private void launchFaceSettingsActivity() { + final Intent intent = new Intent(this, Settings.FaceSettingsInternalActivity.class); + final byte[] token = getIntent().getByteArrayExtra( + ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN); + if (token != null) { + intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token); + } + final int userId = getIntent().getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId()); + if (userId != UserHandle.USER_NULL) { + intent.putExtra(Intent.EXTRA_USER_ID, userId); + } + BiometricUtils.copyMultiBiometricExtras(getIntent(), intent); + intent.putExtra(EXTRA_FROM_SETTINGS_SUMMARY, true); + intent.putExtra(EXTRA_KEY_CHALLENGE, getIntent().getLongExtra(EXTRA_KEY_CHALLENGE, -1L)); + intent.putExtra(EXTRA_KEY_SENSOR_ID, getIntent().getIntExtra(EXTRA_KEY_SENSOR_ID, -1)); + startActivity(intent); + } + @VisibleForTesting @Nullable protected FaceManager getFaceManager() { @@ -232,6 +268,15 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction { @Override protected void onStart() { super.onStart(); + listenFoldEventForPostureGuidance(); + } + + private void listenFoldEventForPostureGuidance() { + if (maxFacesEnrolled()) { + Log.d(TAG, "Device has enrolled face, do not show posture guidance"); + return; + } + if (getPostureGuidanceIntent() == null) { Log.d(TAG, "Device do not support posture guidance"); return; diff --git a/src/com/android/settings/password/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java index 2f136e68f4c..551789d3ff2 100644 --- a/src/com/android/settings/password/SetupChooseLockGeneric.java +++ b/src/com/android/settings/password/SetupChooseLockGeneric.java @@ -109,6 +109,7 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric { super.onViewCreated(view, savedInstanceState); GlifPreferenceLayout layout = (GlifPreferenceLayout) view; + layout.setDescriptionText(loadDescriptionText()); layout.setDividerItemDecoration(new SettingsDividerItemDecoration(getContext())); layout.setDividerInset(getContext().getResources().getDimensionPixelSize( R.dimen.sud_items_glif_text_divider_inset)); @@ -129,11 +130,9 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric { @Override protected void addHeaderView() { - if (isForBiometric()) { - setHeaderView(R.layout.setup_choose_lock_generic_biometrics_header); - } else { - setHeaderView(R.layout.setup_choose_lock_generic_header); - } + // The original logic has been moved to onViewCreated and + // uses GlifLayout#setDescriptionText instead, + // keep empty body here since we won't call super method. } @Override @@ -239,6 +238,12 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric { private boolean isForBiometric() { return mForFingerprint || mForFace || mForBiometrics; } + + String loadDescriptionText() { + return getString(isForBiometric() + ? R.string.lock_settings_picker_biometrics_added_security_message + : R.string.setup_lock_settings_picker_message); + } } public static class InternalActivity extends ChooseLockGeneric.InternalActivity { diff --git a/tests/robotests/src/com/android/settings/biometrics/face/FaceEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/biometrics/face/FaceEnrollIntroductionTest.java index 6c04add9261..9d588557199 100644 --- a/tests/robotests/src/com/android/settings/biometrics/face/FaceEnrollIntroductionTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/face/FaceEnrollIntroductionTest.java @@ -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(); + } + } diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockGenericTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockGenericTest.java index cd79f58ee31..494d3f0671b 100644 --- a/tests/robotests/src/com/android/settings/password/SetupChooseLockGenericTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockGenericTest.java @@ -23,15 +23,20 @@ import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_R import static com.google.common.truth.Truth.assertThat; -import static org.robolectric.Shadows.shadowOf; - import android.content.Intent; +import android.text.TextUtils; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; + +import com.android.settings.password.SetupChooseLockGeneric.SetupChooseLockGenericFragment; import com.android.settings.testutils.shadow.ShadowLockPatternUtils; import com.android.settings.testutils.shadow.ShadowPasswordUtils; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.testutils.shadow.ShadowUtils; +import com.google.android.setupdesign.GlifPreferenceLayout; + import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; @@ -41,6 +46,8 @@ import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowActivity; +import java.util.List; + @RunWith(RobolectricTestRunner.class) @Config(shadows = { ShadowUserManager.class, @@ -78,4 +85,43 @@ public class SetupChooseLockGenericTest { ShadowActivity shadowActivity = Shadows.shadowOf(activity); assertThat(shadowActivity.isFinishing()).isFalse(); } + + @Test + public void setupChooseLockGenericUsingDescriptionTextOfGlifLayout() { + SetupChooseLockGenericFragment fragment = getFragmentOfSetupChooseLockGeneric(false); + GlifPreferenceLayout view = getViewOfSetupChooseLockGenericFragment(fragment); + assertThat(TextUtils.isEmpty(view.getDescriptionText())).isFalse(); + assertThat(view.getDescriptionText().toString()).isEqualTo(fragment.loadDescriptionText()); + } + + @Test + public void setupChooseLockGenericUsingDescriptionTextOfGlifLayoutForBiometric() { + SetupChooseLockGenericFragment fragment = getFragmentOfSetupChooseLockGeneric(true); + GlifPreferenceLayout view = getViewOfSetupChooseLockGenericFragment(fragment); + assertThat(TextUtils.isEmpty(view.getDescriptionText())).isFalse(); + assertThat(view.getDescriptionText().toString()).isEqualTo(fragment.loadDescriptionText()); + } + + private SetupChooseLockGenericFragment getFragmentOfSetupChooseLockGeneric(boolean biometric) { + ShadowPasswordUtils.addGrantedPermission(REQUEST_PASSWORD_COMPLEXITY); + Intent intent = new Intent("com.android.settings.SETUP_LOCK_SCREEN"); + intent.putExtra(EXTRA_KEY_REQUESTED_MIN_COMPLEXITY, PASSWORD_COMPLEXITY_HIGH); + intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, biometric); + SetupChooseLockGeneric activity = + Robolectric.buildActivity(SetupChooseLockGeneric.class, intent).setup().get(); + + List fragments = activity.getSupportFragmentManager().getFragments(); + assertThat(fragments).isNotNull(); + assertThat(fragments.size()).isEqualTo(1); + assertThat(fragments.get(0)).isInstanceOf(SetupChooseLockGenericFragment.class); + + return (SetupChooseLockGenericFragment) fragments.get(0); + } + private GlifPreferenceLayout getViewOfSetupChooseLockGenericFragment( + @NonNull SetupChooseLockGenericFragment fragment) { + assertThat(fragment.getView()).isNotNull(); + assertThat(fragment.getView()).isInstanceOf(GlifPreferenceLayout.class); + + return (GlifPreferenceLayout) fragment.getView(); + } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java index 74e39715062..9a83b5919ee 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java @@ -36,6 +36,7 @@ import java.util.Map; public class ShadowLockPatternUtils { private static boolean sDeviceEncryptionEnabled; + private static Map sUserToActivePasswordQualityMap = new HashMap<>(); private static Map sUserToComplexityMap = new HashMap<>(); private static Map sUserToProfileComplexityMap = new HashMap<>(); private static Map 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;