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

Fixed bug where facelock wasn't set correctly for pattern tutorial

Browse Source 
Change-Id: Id3c47cd2985c8565aec1255c0d08451443f7540c
This commit is contained in:
Danielle Millett
2011-09-13 13:41:26 -04:00
parent 31b562cede
commit b4b8ae7fe1
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/ChooseLockPatternTutorial.java
View File

@@ -66,6 +66,10 @@ public class ChooseLockPatternTutorial extends PreferenceActivity {
Intent intent = new Intent(getActivity(), ChooseLockPattern.class); Intent intent = new Intent(getActivity(), ChooseLockPattern.class);
intent.setFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT); intent.setFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
intent.putExtra("confirm_credentials", false); intent.putExtra("confirm_credentials", false);
final boolean isFallback = getActivity().getIntent()
.getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
intent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK,
isFallback);
startActivity(intent); startActivity(intent);
getActivity().finish(); getActivity().finish();
} }
@@ -99,8 +103,12 @@ public class ChooseLockPatternTutorial extends PreferenceActivity {
getActivity().setResult(ChooseLockPattern.RESULT_FINISHED); getActivity().setResult(ChooseLockPattern.RESULT_FINISHED);
getActivity().finish(); getActivity().finish();
} else if (v == mNextButton) { } else if (v == mNextButton) {
final boolean isFallback = getActivity().getIntent()
.getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
Intent intent = new Intent(getActivity(), ChooseLockPattern.class); Intent intent = new Intent(getActivity(), ChooseLockPattern.class);
intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT); intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
intent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK,
isFallback);
startActivity(intent); startActivity(intent);
getActivity().overridePendingTransition(0, 0); // no animation getActivity().overridePendingTransition(0, 0); // no animation
getActivity().finish(); getActivity().finish();
@@ -108,4 +116,3 @@ public class ChooseLockPatternTutorial extends PreferenceActivity {
} }
} }
} }