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

Merge "Fixed scroll issue w/ FP settings" into tm-qpr-dev am: 7b8bddaac0

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20931688

Change-Id: I22bee3710fa6cdf31c15aae69691f94ddf38aa80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Joshua Mccloskey
2023-01-12 00:12:33 +00:00
committed by Automerger Merge Worker
parent 4915a5932d 7b8bddaac0
commit dc0f04d7ee
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
View File

@@ -494,8 +494,10 @@ public class FingerprintSettings extends SubSettings {
if (root != null) { if (root != null) {
root.removeAll(); root.removeAll();
} }
root = getPreferenceScreen(); final String fpPrefKey = addFingerprintItemPreferences(root);
addFingerprintItemPreferences(root); if (isSfps()) {
scrollToPreference(fpPrefKey);
}
addPreferencesFromResource(getPreferenceScreenResId()); addPreferencesFromResource(getPreferenceScreenResId());
mRequireScreenOnToAuthPreference = findPreference(KEY_REQUIRE_SCREEN_ON_TO_AUTH); mRequireScreenOnToAuthPreference = findPreference(KEY_REQUIRE_SCREEN_ON_TO_AUTH);
mFingerprintUnlockCategory = findPreference(KEY_FINGERPRINT_UNLOCK_CATEGORY); mFingerprintUnlockCategory = findPreference(KEY_FINGERPRINT_UNLOCK_CATEGORY);
@@ -529,15 +531,20 @@ public class FingerprintSettings extends SubSettings {
} }
} }
private void addFingerprintItemPreferences(PreferenceGroup root) { private String addFingerprintItemPreferences(PreferenceGroup root) {
root.removeAll(); root.removeAll();
String keyToReturn = KEY_FINGERPRINT_ADD;
final List<Fingerprint> items = mFingerprintManager.getEnrolledFingerprints(mUserId); final List<Fingerprint> items = mFingerprintManager.getEnrolledFingerprints(mUserId);
final int fingerprintCount = items.size(); final int fingerprintCount = items.size();
for (int i = 0; i < fingerprintCount; i++) { for (int i = 0; i < fingerprintCount; i++) {
final Fingerprint item = items.get(i); final Fingerprint item = items.get(i);
FingerprintPreference pref = new FingerprintPreference(root.getContext(), FingerprintPreference pref = new FingerprintPreference(root.getContext(),
this /* onDeleteClickListener */); this /* onDeleteClickListener */);
pref.setKey(genKey(item.getBiometricId())); String key = genKey(item.getBiometricId());
if (i == 0) {
keyToReturn = key;
}
pref.setKey(key);
pref.setTitle(item.getName()); pref.setTitle(item.getName());
pref.setFingerprint(item); pref.setFingerprint(item);
pref.setPersistent(false); pref.setPersistent(false);
@@ -560,6 +567,8 @@ public class FingerprintSettings extends SubSettings {
addPreference.setOnPreferenceChangeListener(this); addPreference.setOnPreferenceChangeListener(this);
updateAddPreference(); updateAddPreference();
createFooterPreference(root); createFooterPreference(root);
return keyToReturn;
} }
private void updateAddPreference() { private void updateAddPreference() {