commit b81ce47a2bdb42fce2c5a191f16ee9296958a818
author Danielle Millett <dmillett@google.com> Tue Sep 13 10:57:49 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 13 10:57:49 2011 -0700
tree 121f284b8868ccc4ebdfc437f0ce493cb1d46193
parent 52b2745e8532a209b2925c5240e63e2da7bad237
parent b4b8ae7fe12127c6414c1a1c7f62bd3fe61232d8

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

src/com/android/settings/ChooseLockPatternTutorial.java

diff --git a/src/com/android/settings/ChooseLockPatternTutorial.java b/src/com/android/settings/ChooseLockPatternTutorial.java
index 4ad16fb..5dbd616 100644
--- a/src/com/android/settings/ChooseLockPatternTutorial.java
+++ b/src/com/android/settings/ChooseLockPatternTutorial.java
@@ -66,6 +66,10 @@
                 Intent intent = new Intent(getActivity(), ChooseLockPattern.class);
                 intent.setFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
                 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);
                 getActivity().finish();
             }
@@ -99,8 +103,12 @@
                 getActivity().setResult(ChooseLockPattern.RESULT_FINISHED);
                 getActivity().finish();
             } else if (v == mNextButton) {
+                final boolean isFallback = getActivity().getIntent()
+                    .getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
                 Intent intent = new Intent(getActivity(), ChooseLockPattern.class);
                 intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
+                intent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK,
+                                isFallback);
                 startActivity(intent);
                 getActivity().overridePendingTransition(0, 0); // no animation
                 getActivity().finish();
@@ -108,4 +116,3 @@
         }
     }
 }
-