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

Commit ec850043 authored by Selim Cinek's avatar Selim Cinek
Browse files

Added an introduction to the fingerprint enrollment 

Bug: 21468315
Change-Id: Ieb691b0e321f44b9bae2f4f8dfd458c24b98a8d9
parent 7e38eea8

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -1415,6 +1415,7 @@ 
        <activity android:name=".fingerprint.FingerprintEnrollFindSensor" android:exported="false"/>

        <activity android:name=".fingerprint.FingerprintEnrollEnrolling" android:exported="false"/>

        <activity android:name=".fingerprint.FingerprintEnrollFinish" android:exported="false"/>

        <activity android:name=".fingerprint.FingerprintEnrollIntroduction" android:exported="false"/>



        <!-- Note this must not be exported since it returns the password in the intent -->

        <activity android:name="ConfirmLockPattern$InternalActivity"

res/layout/fingerprint_enroll_introduction.xml

0 → 100644
+88 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ 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

  -->



<com.android.setupwizardlib.SetupWizardLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/setup_wizard_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    style="@style/SetupWizardFingerprintStyle">



    <LinearLayout

        style="@style/SuwContentFrame"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical"

        android:clipToPadding="false"

        android:clipChildren="false">



        <TextView

            style="@style/TextAppearance.FingerprintMessage"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/suw_description_margin_top"

            android:text="@string/security_settings_fingerprint_enroll_introduction_message"/>



        <TextView

            style="@style/TextAppearance.FingerprintMessage"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="24dp"

            android:text="@string/security_settings_fingerprint_enroll_introduction_message_warning"/>



        <TextView

            style="@style/TextAppearance.FingerprintLink"

            android:id="@+id/learn_more_button"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="4dp"

            android:text="@string/security_settings_fingerprint_enroll_introduction_risk_link_text"/>



        <View

            android:layout_height="0dp"

            android:layout_width="match_parent"

            android:layout_weight="1"/>



        <LinearLayout

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginEnd="-12dp"

            android:layout_marginBottom="4dp"

            android:layout_gravity="end"

            android:orientation="horizontal">



            <Button

                style="@style/Button.FingerprintButton"

                android:id="@+id/cancel_button"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginEnd="8dp"

                android:text="@string/security_settings_fingerprint_enroll_introduction_cancel" />



            <Button

                style="@style/Button.FingerprintButton"

                android:id="@+id/next_button"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:gravity="end|center_vertical"

                android:text="@string/security_settings_fingerprint_enroll_introduction_continue" />



        </LinearLayout>



    </LinearLayout>



</com.android.setupwizardlib.SetupWizardLayout>

res/values/styles.xml

+5 −0
Original line number Diff line number Diff line
@@ -304,6 +304,11 @@ 
        <item name="android:textColor">?android:attr/colorAccent</item>

    </style>



    <style name="TextAppearance.FingerprintLink"

           parent="TextAppearance.FingerprintMessage">

        <item name="android:textColor">?android:attr/colorAccent</item>

    </style>



    <style name="TextAppearance.FingerprintErrorText"

        parent="android:TextAppearance.Material.Caption">

        <item name="android:textColor">@color/warning</item>

src/com/android/settings/SecuritySettings.java

+5 −9
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
package com.android.settings;





import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;



import android.app.Activity;

import android.app.AlertDialog;

import android.app.admin.DevicePolicyManager;
@@ -54,8 +52,7 @@ import android.util.Log; 
import com.android.internal.logging.MetricsLogger;

import com.android.internal.widget.LockPatternUtils;

import com.android.settings.TrustAgentUtils.TrustAgentComponentInfo;

import com.android.settings.fingerprint.FingerprintEnrollFindSensor;

import com.android.settings.fingerprint.FingerprintEnrollOnboard;

import com.android.settings.fingerprint.FingerprintEnrollIntroduction;

import com.android.settings.fingerprint.FingerprintSettings;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Index;
@@ -65,6 +62,8 @@ import com.android.settings.search.SearchIndexableRaw; 
import java.util.ArrayList;

import java.util.List;



import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;



/**

 * Gesture lock pattern settings.

 */
@@ -358,12 +357,9 @@ public class SecuritySettings extends SettingsPreferenceFragment 
                    R.plurals.security_settings_fingerprint_preference_summary,

                    fingerprintCount, fingerprintCount));

            clazz = FingerprintSettings.class.getName();

        } else if (!hasPassword) {

            // No fingerprints registered, launch into enrollment wizard.

            clazz = FingerprintEnrollOnboard.class.getName();

        } else {

            // Lock thingy is already set up, launch directly into find sensor step from wizard.

            clazz = FingerprintEnrollFindSensor.class.getName();

            clazz = FingerprintEnrollIntroduction.class.getName();

            intent.putExtra(FingerprintEnrollIntroduction.EXTRA_HAS_PASSWORD, hasPassword);

        }

        intent.setClassName("com.android.settings", clazz);

        fingerprintPreference.setIntent(intent);

src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase { 
            }

        } else if (requestCode == ENROLLING) {

            if (resultCode == RESULT_FINISHED) {

                setResult(RESULT_FINISHED);

                finish();

            }

        } else {