Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Moving fallback check code to Settings"

Browse Source
This commit is contained in:
Steven Ross
2011-09-30 13:08:29 -07:00
committed by Android (Google) Code Review
parent f260103fbf 3553c296c0
commit 97758c48cd
1 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/java/com/android/internal/widget/LockPatternUtils.java
View File

@@ -126,8 +126,6 @@ public class LockPatternUtils {
private static FileObserver sPasswordObserver;
private static boolean mLastAttemptWasBiometric = false;
private static class PasswordFileObserver extends FileObserver {
public PasswordFileObserver(String path, int mask) {
super(path, mask);
@@ -393,13 +391,6 @@ public class LockPatternUtils {
setLong(DISABLE_LOCKSCREEN_KEY, disable ? 1 : 0);
}
/**
* Sets whether the last lockscreen setup attempt was biometric
*/
public static void setLastAttemptWasBiometric(boolean val) {
mLastAttemptWasBiometric = val;
}
/**
* Determine if LockScreen can be disabled. This is used, for example, to tell if we should
* show LockScreen or go straight to the home screen.
@@ -430,15 +421,13 @@ public class LockPatternUtils {
}
/**
* Calls back SetupFaceLock to delete the temporary gallery file if this is the backup lock.
* Calls back SetupFaceLock to delete the temporary gallery file
*/
public void deleteTempGallery() {
//if(mLastAttemptWasBiometric) {
Intent intent = new Intent().setClassName("com.android.facelock",
"com.android.facelock.SetupFaceLock");
intent.putExtra("deleteTempGallery", true);
mContext.startActivity(intent);
//}
Intent intent = new Intent().setClassName("com.android.facelock",
"com.android.facelock.SetupFaceLock");
intent.putExtra("deleteTempGallery", true);
mContext.startActivity(intent);
}
/**