- new onboarding flow ("locate sensor")
- changed sensor location image
- changed in-app sensor icon
- remove fingerprint animation since it caused people to
want to tap on it.
- remove enrolled fingerprint templates when switching back to "none" or "slide"
- use real in-app icon for fingerprint
- much improved layout
- basic landscape layout working
- added 250ms delay to final enrollment step so it's not so jarring
- delete is now working
- rename wired, but not functional yet
Bug 19592835
Change-Id: Ie3e73a2fc8f834f1b90e2746c4cc841216aa6031
236 lines
9.9 KiB
Java
236 lines
9.9 KiB
Java
/*
|
|
* Copyright (C) 2015 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package com.android.settings;
|
|
|
|
|
|
import android.app.Activity;
|
|
import android.app.AlertDialog;
|
|
import android.content.Context;
|
|
import android.content.DialogInterface;
|
|
import android.content.Intent;
|
|
import android.os.Bundle;
|
|
import android.preference.Preference;
|
|
import android.preference.Preference.OnPreferenceChangeListener;
|
|
import android.preference.PreferenceGroup;
|
|
import android.preference.PreferenceScreen;
|
|
import android.service.fingerprint.FingerprintManager;
|
|
import android.service.fingerprint.FingerprintManagerReceiver;
|
|
import android.service.fingerprint.FingerprintManager.FingerprintItem;
|
|
import android.util.Log;
|
|
import android.widget.EditText;
|
|
|
|
import com.android.settings.search.Indexable;
|
|
|
|
import java.util.HashMap;
|
|
import java.util.List;
|
|
|
|
/**
|
|
* Settings screen for fingerprints
|
|
*/
|
|
public class FingerprintSettings extends SettingsActivity {
|
|
|
|
@Override
|
|
public Intent getIntent() {
|
|
Intent modIntent = new Intent(super.getIntent());
|
|
modIntent.putExtra(EXTRA_SHOW_FRAGMENT, FingerprintSettingsFragment.class.getName());
|
|
return modIntent;
|
|
}
|
|
|
|
@Override
|
|
protected boolean isValidFragment(String fragmentName) {
|
|
if (FingerprintSettingsFragment.class.getName().equals(fragmentName)) return true;
|
|
return false;
|
|
}
|
|
|
|
@Override
|
|
public void onCreate(Bundle savedInstanceState) {
|
|
super.onCreate(savedInstanceState);
|
|
CharSequence msg = getText(R.string.security_settings_fingerprint_preference_title);
|
|
setTitle(msg);
|
|
}
|
|
|
|
public static class FingerprintSettingsFragment extends SettingsPreferenceFragment
|
|
implements OnPreferenceChangeListener, Indexable {
|
|
private static final String TAG = "FingerprintSettings";
|
|
private static final String KEY_FINGERPRINT_ITEM = "key_fingerprint_item";
|
|
private static final String KEY_USAGE_CATEGORY = "fingerprint_usage_category";
|
|
private static final String KEY_FINGERPRINT_ADD = "key_fingerprint_add";
|
|
private static final String KEY_MANAGE_CATEGORY = "fingerprint_manage_category";
|
|
private static final String KEY_FINGERPRINT_ENABLE_KEYGUARD_TOGGLE =
|
|
"fingerprint_enable_keyguard_toggle";
|
|
|
|
private static final int ADD_FINGERPRINT_REQUEST = 10;
|
|
|
|
private static final boolean ENABLE_USAGE_CATEGORY = false;
|
|
|
|
private FingerprintManager mFingerprintManager;
|
|
private HashMap<Preference, FingerprintItem> mFingerprintMap
|
|
= new HashMap<Preference, FingerprintManager.FingerprintItem>();
|
|
private EditText mDialogTextField;
|
|
|
|
@Override
|
|
public void onCreate(Bundle savedInstanceState) {
|
|
super.onCreate(savedInstanceState);
|
|
mFingerprintManager = (FingerprintManager) getActivity().getSystemService(
|
|
Context.FINGERPRINT_SERVICE);
|
|
mFingerprintManager.startListening(new FingerprintManagerReceiver() {
|
|
@Override
|
|
public void onRemoved(int fingerprintId) {
|
|
Log.v(TAG, "Fingerprint template " + fingerprintId + " removed");
|
|
// TODO: this is a bit wasteful; just remove the fingerprint id item
|
|
createPreferenceHierarchy();
|
|
}
|
|
@Override
|
|
public void onProcessed(int fingerprintId) {
|
|
Log.v(TAG, "Fingerprint " + fingerprintId + " detected");
|
|
}
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Important!
|
|
*
|
|
* Don't forget to update the SecuritySearchIndexProvider if you are doing any change in the
|
|
* logic or adding/removing preferences here.
|
|
*/
|
|
private PreferenceScreen createPreferenceHierarchy() {
|
|
PreferenceScreen root = getPreferenceScreen();
|
|
if (root != null) {
|
|
root.removeAll();
|
|
}
|
|
addPreferencesFromResource(R.xml.security_settings_fingerprint);
|
|
root = getPreferenceScreen();
|
|
|
|
// Fingerprint items
|
|
PreferenceGroup manageCategory = (PreferenceGroup) root.findPreference(
|
|
KEY_MANAGE_CATEGORY);
|
|
if (manageCategory != null) {
|
|
addFingerprintItemPreferences(manageCategory);
|
|
}
|
|
|
|
// Fingerprint usage options
|
|
PreferenceGroup usageCategory = (PreferenceGroup) root.findPreference(
|
|
KEY_USAGE_CATEGORY);
|
|
if (usageCategory != null) {
|
|
Preference toggle = root.findPreference(KEY_FINGERPRINT_ENABLE_KEYGUARD_TOGGLE);
|
|
toggle.setOnPreferenceChangeListener(this);
|
|
if (!ENABLE_USAGE_CATEGORY) {
|
|
root.removePreference(usageCategory);
|
|
} else {
|
|
toggle.setOnPreferenceChangeListener(this);
|
|
}
|
|
}
|
|
|
|
return root;
|
|
}
|
|
|
|
private void addFingerprintItemPreferences(PreferenceGroup manageFingerprintCategory) {
|
|
manageFingerprintCategory.removeAll();
|
|
List<FingerprintItem> items = mFingerprintManager.getEnrolledFingerprints();
|
|
final int fingerprintCount = items.size();
|
|
mFingerprintMap.clear();
|
|
for (int i = 0; i < fingerprintCount; i++) {
|
|
Preference pref = new Preference(manageFingerprintCategory.getContext());
|
|
pref.setKey(KEY_FINGERPRINT_ITEM);
|
|
FingerprintItem item = items.get(i);
|
|
pref.setTitle(item.name);
|
|
manageFingerprintCategory.addPreference(pref);
|
|
pref.setOnPreferenceChangeListener(this);
|
|
mFingerprintMap.put(pref, item);
|
|
}
|
|
Preference addPreference = new Preference(manageFingerprintCategory.getContext());
|
|
addPreference.setKey(KEY_FINGERPRINT_ADD);
|
|
addPreference.setTitle(R.string.fingerprint_add_title);
|
|
manageFingerprintCategory.addPreference(addPreference);
|
|
addPreference.setOnPreferenceChangeListener(this);
|
|
}
|
|
|
|
@Override
|
|
public void onResume() {
|
|
super.onResume();
|
|
// Make sure we reload the preference hierarchy since fingerprints may be added,
|
|
// deleted or renamed.
|
|
createPreferenceHierarchy();
|
|
}
|
|
|
|
@Override
|
|
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference pref) {
|
|
final String key = pref.getKey();
|
|
if (KEY_FINGERPRINT_ADD.equals(key)) {
|
|
Intent intent = new Intent();
|
|
intent.setClassName("com.android.settings", FingerprintEnroll.class.getName());
|
|
startActivityForResult(intent, ADD_FINGERPRINT_REQUEST);
|
|
} else if (KEY_FINGERPRINT_ITEM.equals(key)) {
|
|
final FingerprintItem item = mFingerprintMap.get(pref);
|
|
showRenameDeleteDialog(item.name, pref, item.id);
|
|
return super.onPreferenceTreeClick(preferenceScreen, pref);
|
|
}
|
|
return true;
|
|
}
|
|
|
|
private void showRenameDeleteDialog(final CharSequence name, Preference pref,
|
|
final int fpId) {
|
|
final Activity activity = getActivity();
|
|
AlertDialog dialog = new AlertDialog.Builder(activity)
|
|
.setView(R.layout.fingerprint_rename_dialog)
|
|
.setPositiveButton(R.string.security_settings_fingerprint_enroll_dialog_ok,
|
|
new DialogInterface.OnClickListener() {
|
|
@Override
|
|
public void onClick(DialogInterface dialog, int which) {
|
|
String newName = mDialogTextField.getText().toString();
|
|
if (!newName.equals(name)) {
|
|
Log.v(TAG, "Would rename " + name + " to " + newName);
|
|
mFingerprintManager.rename(fpId, newName);
|
|
}
|
|
dialog.dismiss();
|
|
}
|
|
})
|
|
.setNegativeButton(R.string.security_settings_fingerprint_enroll_dialog_delete,
|
|
new DialogInterface.OnClickListener() {
|
|
@Override
|
|
public void onClick(DialogInterface dialog, int which) {
|
|
Log.v(TAG, "Removing fpId " + fpId);
|
|
mFingerprintManager.remove(fpId);
|
|
dialog.dismiss();
|
|
}
|
|
})
|
|
.create();
|
|
dialog.show();
|
|
mDialogTextField = (EditText) dialog.findViewById(R.id.fingerprint_rename_field);
|
|
mDialogTextField.setText(name);
|
|
mDialogTextField.selectAll();
|
|
}
|
|
|
|
@Override
|
|
public boolean onPreferenceChange(Preference preference, Object value) {
|
|
boolean result = true;
|
|
final String key = preference.getKey();
|
|
if (KEY_FINGERPRINT_ENABLE_KEYGUARD_TOGGLE.equals(key)) {
|
|
// TODO
|
|
} else {
|
|
Log.v(TAG, "Unknown key:" + key);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
@Override
|
|
protected int getHelpResource() {
|
|
return R.string.help_url_security;
|
|
}
|
|
}
|
|
}
|