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

am 6712be4a: am d409b700: am f516e7dd: Make \'fingerprint\' searchable in Settings.

Browse Source 
* commit '6712be4a70ecd9d21ae78bf7dc65afc92b277937':
  Make 'fingerprint' searchable in Settings.
This commit is contained in:
Julia Reynolds
2015-07-21 15:57:46 +00:00
committed by Android Git Automerger
parent 3234f0b9bd 6712be4a70
commit 3d94772b08
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/SecuritySettings.java
View File

@@ -791,6 +791,16 @@ public class SecuritySettings extends SettingsPreferenceFragment
result.add(data);
}
// Fingerprint
FingerprintManager fpm =
(FingerprintManager) context.getSystemService(Context.FINGERPRINT_SERVICE);
if (fpm.isHardwareDetected()) {
data = new SearchIndexableRaw(context);
data.title = res.getString(R.string.security_settings_fingerprint_preference_title);
data.screenTitle = screenTitle;
result.add(data);
}
// Credential storage
final UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);

2
src/com/android/settings/fingerprint/FingerprintSettings.java
View File

@@ -104,7 +104,7 @@ public class FingerprintSettings extends SubSettings {
}
public static class FingerprintSettingsFragment extends SettingsPreferenceFragment
implements OnPreferenceChangeListener, Indexable {
implements OnPreferenceChangeListener {
private static final int MAX_RETRY_ATTEMPTS = 20;
private static final int RESET_HIGHLIGHT_DELAY_MS = 500;