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

Update Settings to use new fingerprint API

Browse Source 
Bug 16487912

Change-Id: I99ac78f476d43f6b87f5dd20e597c51ed08d2c0e
This commit is contained in:
Jim Miller
2015-03-24 16:02:59 -07:00
parent c24adcdf83
commit d16c9b7c31
5 changed files with 141 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -34,11 +34,14 @@ import android.os.UserManager;
import android.preference.Preference;
import android.preference.PreferenceScreen;
import android.security.KeyStore;
import android.service.fingerprint.Fingerprint;
import android.service.fingerprint.FingerprintManager;
import android.service.fingerprint.FingerprintManagerReceiver;
import android.service.fingerprint.FingerprintManager.RemovalCallback;
import android.util.EventLog;
import android.util.Log;
import android.view.accessibility.AccessibilityManager;
import android.widget.Toast;
import com.android.internal.widget.LockPatternUtils;
import java.util.List;
@@ -96,6 +99,18 @@ public class ChooseLockGeneric extends SettingsActivity {
private boolean mRequirePassword;
private LockPatternUtils mLockPatternUtils;
private FingerprintManager mFingerprintManager;
private RemovalCallback mRemovalCallback = new RemovalCallback() {
@Override
public void onRemovalSucceeded(Fingerprint fingerprint) {
Log.v(TAG, "Fingerprint removed: " + fingerprint.getFingerId());
}
@Override
public void onRemovalError(Fingerprint fp, int errMsgId, CharSequence errString) {
Toast.makeText(getActivity(), errString, Toast.LENGTH_SHORT);
}
};
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -400,25 +415,15 @@ public class ChooseLockGeneric extends SettingsActivity {
}
}
// TODO: This is only required because we used to enforce clients have a listener,
// which is no longer required in the new API. Remove when that happens.
FingerprintManagerReceiver mReceiver = new FingerprintManagerReceiver() {
public void onRemoved(int fingerprintId) {
Log.v(TAG, "onRemoved(id=" + fingerprintId + ")");
}
};
private void removeAllFingerprintTemplates() {
if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected()) {
mFingerprintManager.startListening(mReceiver);
mFingerprintManager.remove(0 /* all fingerprint templates */);
mFingerprintManager.remove(new Fingerprint(null, 0, 0, 0), mRemovalCallback);
}
}
@Override
public void onDestroy() {
super.onDestroy();
mFingerprintManager.stopListening();
}
@Override