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

Profile Challenge Fingerprint Support

Browse Source 
Change-Id: Ic83c479f645776dd0678721bfb732b399f09c992
This commit is contained in:
Clara Bayarri
2016-01-07 17:10:27 +00:00
parent 1b4e746a7f
commit 40db4bbbb5
15 changed files with 145 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/ConfirmLockPassword.java
View File

@@ -99,7 +99,6 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
private AppearAnimationUtils mAppearAnimationUtils;
private DisappearAnimationUtils mDisappearAnimationUtils;
private boolean mBlockImm;
private int mEffectiveUserId;
// required constructor for fragments
public ConfirmLockPasswordFragment() {
@@ -110,9 +109,6 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mLockPatternUtils = new LockPatternUtils(getActivity());
Intent intent = getActivity().getIntent();
// Only take this argument into account if it belongs to the current profile.
mEffectiveUserId = Utils.getUserIdFromBundle(getActivity(), intent.getExtras());
}
@Override
@@ -183,14 +179,13 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
private int getDefaultDetails() {
boolean isProfile = Utils.isManagedProfile(
UserManager.get(getActivity()), mEffectiveUserId);
if (mIsAlpha && !isProfile) {
return R.string.lockpassword_confirm_your_password_generic;
} else if (mIsAlpha && isProfile) {
return R.string.lockpassword_confirm_your_password_generic_profile;
} else if (!isProfile) {
return R.string.lockpassword_confirm_your_pin_generic;
if (mIsAlpha) {
return isProfile ? R.string.lockpassword_confirm_your_password_generic_profile
: R.string.lockpassword_confirm_your_password_generic;
} else {
return isProfile ? R.string.lockpassword_confirm_your_pin_generic_profile
: R.string.lockpassword_confirm_your_pin_generic;
}
return R.string.lockpassword_confirm_your_pin_generic_profile;
}
private int getErrorMessage() {