Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3b59d6e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Refactor ChooseLockGenericController" into sc-dev

parents 7d3c283e 8e4acdbf

res/values/strings.xml

+4 −4
Original line number Diff line number Diff line
@@ -1311,16 +1311,16 @@ 
    <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->

    <string name="lock_settings_picker_title">Choose screen lock</string>









    <!--  Screen title. This title is asking the user to choose a type of screen lock for their device, such as a pattern, PIN, or password. [CHAR LIMIT=27] -->









    <!--  Screen title. This title is asking the user to choose a type of screen lock for their device, such as a pattern, PIN, or password. [CHAR LIMIT=55] -->









    <string name="lock_settings_picker_new_lock_title">Choose a screen lock</string>

















    <!--  Screen title. This title is asking the user to choose a new screen lock for their device, such as a pattern, PIN, or password. [CHAR LIMIT=27] -->









    <!--  Screen title. This title is asking the user to choose a new screen lock for their device, such as a pattern, PIN, or password. [CHAR LIMIT=55] -->









    <string name="lock_settings_picker_update_lock_title">Choose a new screen lock</string>

















    <!--  Screen title. This title is asking the user to choose a type of screen lock (such as a pattern, PIN, or password) that they need to enter to use their work apps. [CHAR LIMIT=27] -->









    <!--  Screen title. This title is asking the user to choose a type of screen lock (such as a pattern, PIN, or password) that they need to enter to use their work apps. [CHAR LIMIT=56] -->









    <string name="lock_settings_picker_new_profile_lock_title">Choose a lock for work apps</string>

















    <!--  Screen title. This title is asking the user to choose a new screen lock (such as a pattern, PIN, or password) that they need to enter to use their work apps. [CHAR LIMIT=27] -->









    <!--  Screen title. This title is asking the user to choose a new screen lock (such as a pattern, PIN, or password) that they need to enter to use their work apps. [CHAR LIMIT=55] -->









    <string name="lock_settings_picker_update_profile_lock_title">Choose a new work lock</string>

















    <!--  Title for security picker in setup wizard to choose the unlock method: None/Pattern/PIN/Password (tablet) [CHAR LIMIT=22] -->

























src/com/android/settings/biometrics/BiometricEnrollActivity.java



+2
−5






























Original line number
Diff line number
Diff line







@@ -298,9 +298,7 @@ public class BiometricEnrollActivity extends InstrumentedActivity {







    private void launchChooseLock() {









        Log.d(TAG, "launchChooseLock");









        Intent intent = BiometricUtils.getChooseLockIntent(this, getIntent());









        intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,









                DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);









        intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS, true);









        intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.HIDE_INSECURE_OPTIONS, true);









        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, true);









        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_BIOMETRICS, true);


















@@ -350,8 +348,7 @@ public class BiometricEnrollActivity extends InstrumentedActivity {







        final Intent intent;









        // If only device credential was specified, ask the user to only set that up.









        intent = new Intent(this, ChooseLockGeneric.class);









        intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,









                DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);









        intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.HIDE_INSECURE_OPTIONS, true);









        launchEnrollActivity(intent);









    }










































src/com/android/settings/biometrics/BiometricEnrollIntroduction.java



+1
−3






























Original line number
Diff line number
Diff line







@@ -222,9 +222,7 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase

















    private void launchChooseLock() {









        Intent intent = BiometricUtils.getChooseLockIntent(this, getIntent());









        intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,









                DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);









        intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS, true);









        intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.HIDE_INSECURE_OPTIONS, true);









        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, true);









        intent.putExtra(getExtraKeyForBiometric(), true);









        if (mUserId != UserHandle.USER_NULL) {
































src/com/android/settings/biometrics/combination/BiometricsSettingsBase.java



+2
−4






























Original line number
Diff line number
Diff line







@@ -19,7 +19,6 @@ import static android.app.Activity.RESULT_OK;

















import static com.android.settings.password.ChooseLockPattern.RESULT_FINISHED;



















import android.app.admin.DevicePolicyManager;









import android.content.Context;









import android.content.Intent;









import android.hardware.face.FaceManager;








@@ -193,9 +192,8 @@ public abstract class BiometricsSettingsBase extends DashboardFragment {

















        if (!launched) {









            Intent intent = BiometricUtils.getChooseLockIntent(getActivity(), getIntent());









            intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,









                    DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);









            intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS, true);









            intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.HIDE_INSECURE_OPTIONS,









                    true);









            intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, true);









            intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_BIOMETRICS, true);










































src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java



+1
−3






























Original line number
Diff line number
Diff line







@@ -685,9 +685,7 @@ public class FingerprintSettings extends SubSettings {







                // TODO: This should be cleaned up. ChooseLockGeneric should provide a way of









                //  specifying arguments/requests, instead of relying on callers setting extras.









                intent.setClassName(SETTINGS_PACKAGE_NAME, ChooseLockGeneric.class.getName());









                intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,









                        DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);









                intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS,









                intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.HIDE_INSECURE_OPTIONS,









                        true);









                intent.putExtra(Intent.EXTRA_USER_ID, mUserId);









                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, true);