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

Add missing 'pin' screen lock option

Browse Source 
bug: 62206837
Test: Manual verified; Existing tests pass
Change-Id: I65985427cb012668ee23bedaf7253bec7c83fe75
This commit is contained in:
Ajay Nadathur
2017-06-19 16:13:31 -07:00
parent 2de5ab35f8
commit a5f7392d51
4 changed files with 145 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/password/SetupChooseLockPassword.java
View File

@@ -114,9 +114,7 @@ public class SetupChooseLockPassword extends ChooseLockPassword {
}
private void launchChooseLockGeneric() {
ScreenLockType currentLock = mIsAlphaMode
? ScreenLockType.PASSWORD : ScreenLockType.PIN;
ChooseLockTypeDialogFragment.newInstance(mUserId, currentLock.toString())
ChooseLockTypeDialogFragment.newInstance(mUserId)
.show(getChildFragmentManager(), null);
}
@@ -130,6 +128,12 @@ public class SetupChooseLockPassword extends ChooseLockPassword {
@Override
public void onLockTypeSelected(ScreenLockType lock) {
ScreenLockType currentLockType = mIsAlphaMode ?
ScreenLockType.PASSWORD : ScreenLockType.PIN;
if (currentLockType.equals(lock)) {
// ignore same lock type.
return;
}
Intent activityIntent = getActivity().getIntent();
Intent intent = new Intent(getContext(), SetupChooseLockGeneric.class);