Default setup wizard to use PIN
- Added "Screen lock options" button in PIN screen, controlled by extra EXTRA_SHOW_OPTIONS_BUTTON, which will create a dialog to ask the user to choose another screen lock type. - Extracted ScreenLockType enum and ChooseLockGenericController that can be shared by ChooseLockGeneric and the dialog ChooseLockTypeDialogFragment. - The intent extra EXTRA_SHOW_OPTIONS_BUTTON will be set if ChooseLockGeneric screen starts ChooseLockPassword / ChooseLockPattern without asking the user. (Although the extra is ignored by ChooseLockPattern currently) - Fix layout alignment for the password entry field to remove the extra 4dp padding on the sides. Test: cd tests/robotests && mma Bug: 35442933 Bug: 38002299 Change-Id: I877fbe08a0c05bb97175e1cbf0260ea6dbda22e2
This commit is contained in:
49
tests/robotests/src/android/app/admin/PasswordMetrics.java
Normal file
49
tests/robotests/src/android/app/admin/PasswordMetrics.java
Normal file
@@ -0,0 +1,49 @@
|
||||
/*
|
||||
* Copyright (C) 2017 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package android.app.admin;
|
||||
|
||||
import android.annotation.NonNull;
|
||||
|
||||
/**
|
||||
* Stub implementation of framework's PasswordMetrics for Robolectric tests. Otherwise Robolectric
|
||||
* is throwing ClassNotFoundError.
|
||||
*
|
||||
* TODO: Remove this class when Robolectric supports O
|
||||
*/
|
||||
public class PasswordMetrics {
|
||||
|
||||
// Maximum allowed number of repeated or ordered characters in a sequence before we'll
|
||||
// consider it a complex PIN/password.
|
||||
public static final int MAX_ALLOWED_SEQUENCE = 3;
|
||||
|
||||
public int length = 0;
|
||||
public int letters = 0;
|
||||
public int upperCase = 0;
|
||||
public int lowerCase = 0;
|
||||
public int numeric = 0;
|
||||
public int symbols = 0;
|
||||
public int nonLetter = 0;
|
||||
|
||||
public static int maxLengthSequence(@NonNull String string) {
|
||||
// Stub implementation
|
||||
return 1;
|
||||
}
|
||||
|
||||
public static PasswordMetrics computeForPassword(@NonNull String password) {
|
||||
return new PasswordMetrics();
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user