Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc1291e1 authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I9ead82f334b4ca2b69989707d5890f9e8cdf3ab3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d9ef61d3 dc0f04d7

src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java

+13 −4
Original line number Diff line number Diff line
@@ -499,8 +499,10 @@ public class FingerprintSettings extends SubSettings { 
            if (root != null) {

                root.removeAll();

            }

            root = getPreferenceScreen();

            addFingerprintItemPreferences(root);

            final String fpPrefKey = addFingerprintItemPreferences(root);

            if (isSfps()) {

                scrollToPreference(fpPrefKey);

            }

            addPreferencesFromResource(getPreferenceScreenResId());

            mRequireScreenOnToAuthPreference = findPreference(KEY_REQUIRE_SCREEN_ON_TO_AUTH);

            mFingerprintUnlockCategory = findPreference(KEY_FINGERPRINT_UNLOCK_CATEGORY);
@@ -534,15 +536,20 @@ public class FingerprintSettings extends SubSettings { 
            }

        }



        private void addFingerprintItemPreferences(PreferenceGroup root) {

        private String addFingerprintItemPreferences(PreferenceGroup root) {

            root.removeAll();

            String keyToReturn = KEY_FINGERPRINT_ADD;

            final List<Fingerprint> items = mFingerprintManager.getEnrolledFingerprints(mUserId);

            final int fingerprintCount = items.size();

            for (int i = 0; i < fingerprintCount; i++) {

                final Fingerprint item = items.get(i);

                FingerprintPreference pref = new FingerprintPreference(root.getContext(),

                        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.setFingerprint(item);

                pref.setPersistent(false);
@@ -565,6 +572,8 @@ public class FingerprintSettings extends SubSettings { 
            addPreference.setOnPreferenceChangeListener(this);

            updateAddPreference();

            createFooterPreference(root);



            return keyToReturn;

        }



        private void updateAddPreference() {