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

Commit 1af9dc2b authored by d34d's avatar d34d Committed by Andy Mast
Browse files

Fix patch derpage for fingerprint settings 

Enable fingerprint option in Settings [3/3] was merged with an old
patchset so this patch re-adds the missing changes.

Change-Id: Ie093f7e18c83d9ead7b878c93ddc91cc8fc8914b
parent 94a8998b

res/layout/.fingerprint_item.xml.swp

deleted100644 → 0
−12 KiB

File deleted.

View file

res/xml/security_settings_fingerprint.xml

+0 −5
Original line number Diff line number Diff line
@@ -39,11 +39,6 @@ 
            android:title="@string/unlock_quick_unlock_control_title"

            android:summary="@string/unlock_quick_unlock_control_summary" />



        <com.android.settings.cyanogenmod.SystemSettingSwitchPreference

            android:key="lockscreen_scramble_pin_layout"

            android:title="@string/unlock_scramble_pin_layout_title"

            android:summary="@string/unlock_scramble_pin_layout_summary" />



        <ListPreference

            android:key="lock_after_timeout"

            android:title="@string/lock_after_timeout"

src/com/android/settings/ChooseLockGeneric.java

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ public class ChooseLockGeneric extends SettingsActivity { 
         * @param disabled

         */

        private void maybeEnableEncryption(int quality, boolean disabled) {

            maybeEnableEncryption(quality, disabled, 0);

            maybeEnableEncryption(quality, disabled, LockPatternUtils.BIOMETRIC_WEAK_UNKNOWN);

        }



        /**

src/com/android/settings/ManageFingerprints.java

+3 −3
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010 The Android Open Source Project

 * Copyright (C) 2015 The CyanogenMod Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -99,8 +99,7 @@ public class ManageFingerprints extends SettingsActivity { 
            mWaitingForConfirmation = savedInstanceState.getBoolean(WAITING_FOR_CONFIRMATION);

        }



        if (mPasswordConfirmed) {

        } else if (!mWaitingForConfirmation) {

        if (!mPasswordConfirmed && !mWaitingForConfirmation) {

            ChooseLockSettingsHelper helper =

                    new ChooseLockSettingsHelper(this, null);

            if (!helper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST, null, null)) {
@@ -136,6 +135,7 @@ public class ManageFingerprints extends SettingsActivity { 
    @Override

    protected void onActivityResult(int requestCode, int resultCode, Intent data) {

        if (requestCode == CONFIRM_EXISTING_REQUEST && resultCode == Activity.RESULT_OK) {

            mWaitingForConfirmation = false;

            mPasswordConfirmed = true;

        } else if (requestCode == SET_FALLBACK &&

                (resultCode == Activity.RESULT_OK || resultCode == Activity.RESULT_FIRST_USER)) {

src/com/android/settings/SetupChooseLockGeneric.java

+2 −1
Original line number Diff line number Diff line
@@ -128,7 +128,8 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric 


        @Override

        protected Intent getLockPatternIntent(Context context, boolean isFallback,

                boolean isFingerprintFallback, boolean requirePassword, boolean confirmCredentials) {

                boolean isFingerprintFallback, boolean requirePassword,

                boolean confirmCredentials) {

            final Intent intent = SetupChooseLockPattern.createIntent(context, isFallback,

                    requirePassword, isFingerprintFallback, confirmCredentials);

            SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);