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

Commit 06dc55d6 authored by Udam Saini's avatar Udam Saini Committed by Android (Google) Code Review
Browse files

Merge "Removes fingerprint onboard screen"

parents f7853577 cce5339d

AndroidManifest.xml

+0 −2
Original line number Diff line number Diff line
@@ -1509,13 +1509,11 @@ 
            android:theme="@style/Theme.ConfirmDeviceCredentials"/>



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

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

        <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" />



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

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

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

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

res/layout/fingerprint_enroll_onboard.xml

deleted100644 → 0
+0 −108
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="?attr/fingerprint_layout_theme">



    <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:layout_marginBottom="@dimen/suw_description_margin_top"

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



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal"

            android:paddingTop="12dp"

            android:paddingBottom="12dp">



            <ImageView

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center_vertical"

                android:layout_marginEnd="24dp"

                android:importantForAccessibility="no"

                android:src="@drawable/ic_check"

                android:tint="?android:attr/textColorPrimary" />



            <TextView

                style="@style/TextAppearance.FingerprintMessage"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_gravity="center_vertical"

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



        </LinearLayout>



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal"

            android:paddingTop="12dp"

            android:paddingBottom="12dp">



            <ImageView

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center_vertical"

                android:layout_marginEnd="24dp"

                android:importantForAccessibility="no"

                android:src="@drawable/ic_check"

                android:tint="?android:attr/textColorPrimary" />



            <TextView

                style="@style/TextAppearance.FingerprintMessage"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_gravity="center_vertical"

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



        </LinearLayout>



        <View

            android:layout_height="0dp"

            android:layout_width="match_parent"

            android:layout_weight="1"/>



        <Button

            style="@style/Button.FingerprintButton"

            android:id="@+id/next_button"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginBottom="4dp"

            android:layout_marginEnd="-12dp"

            android:layout_gravity="end"

            android:gravity="end|center_vertical"

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



    </LinearLayout>



</com.android.setupwizardlib.SetupWizardLayout>

res/values/strings.xml

+0 −11
Original line number Diff line number Diff line
@@ -734,17 +734,6 @@ 
    </plurals>

    <!-- message shown in summary field when no fingerprints are registered -->

    <string name="security_settings_fingerprint_preference_summary_none"></string>

    <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->

    <string name="security_settings_fingerprint_enroll_onboard_title">Fingerprint setup</string>

    <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an

         alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->

    <string name="security_settings_fingerprint_enroll_onboard_message">To use your fingerprint to unlock your screen or confirm purchases, you\u2019ll need to:</string>

    <!-- Introduction message shown in fingerprint enrollment dialog, first item to describe what

         the user needs to do. -->

    <string name="security_settings_fingerprint_enroll_onboard_message_1">Set up your backup screen lock method</string>

    <!-- Introduction message shown in fingerprint enrollment dialog, second item to describe what

         the user needs to do. -->

    <string name="security_settings_fingerprint_enroll_onboard_message_2">Add your fingerprint</string>

    <!-- Introduction title shown in fingerprint enrollment to introduce the fingerprint feature[CHAR LIMIT=29] -->

    <string name="security_settings_fingerprint_enroll_introduction_title">Unlock with fingerprint</string>

    <!-- Introduction detail message shown in fingerprint enrollment dialog [CHAR LIMIT=NONE]-->

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

+3 −3
Original line number Diff line number Diff line
@@ -86,6 +86,9 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase { 
        if (token != null) {

            intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);

        }

        if (mUserId != UserHandle.USER_NULL) {

            intent.putExtra(Intent.EXTRA_USER_ID, mUserId);

        }

        startActivityForResult(intent, FINGERPRINT_FIND_SENSOR_REQUEST);

    }
@@ -95,9 +98,6 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase { 


    protected Intent getFindSensorIntent() {

        Intent intent = new Intent(this, FingerprintEnrollFindSensor.class);

        if (mUserId != UserHandle.USER_NULL) {

            intent.putExtra(Intent.EXTRA_USER_ID, mUserId);

        }

        return intent;

    }

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

deleted100644 → 0
+0 −98
Original line number Diff line number Diff line 
/*

 * 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

 */



package com.android.settings.fingerprint;



import android.app.admin.DevicePolicyManager;

import android.content.Intent;

import android.hardware.fingerprint.FingerprintManager;

import android.os.Bundle;

import android.os.UserHandle;



import com.android.internal.logging.MetricsLogger;

import com.android.settings.ChooseLockGeneric;

import com.android.settings.ChooseLockSettingsHelper;

import com.android.settings.R;



/**

 * Onboarding activity for fingerprint enrollment.

 */

public class FingerprintEnrollOnboard extends FingerprintEnrollBase {



    private static final int CHOOSE_LOCK_GENERIC_REQUEST = 1;



    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        setContentView(R.layout.fingerprint_enroll_onboard);

        setHeaderText(R.string.security_settings_fingerprint_enroll_onboard_title);

    }



    @Override

    protected void onNextButtonClick() {

        launchChooseLock();

    }



    @Override

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

        if (requestCode == CHOOSE_LOCK_GENERIC_REQUEST && resultCode == RESULT_FINISHED) {

            byte[] token = data.getByteArrayExtra(

                    ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);

            setResult(RESULT_FINISHED);

            launchFindSensor(token);

        } else {

            super.onActivityResult(requestCode, resultCode, data);

        }

    }



    private void launchChooseLock() {

        Intent intent = getChooseLockIntent();

        long challenge = getSystemService(FingerprintManager.class).preEnroll();

        intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,

                DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);

        intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS, true);

        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);

        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);

        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, true);

        if (mUserId != UserHandle.USER_NULL) {

            intent.putExtra(Intent.EXTRA_USER_ID, mUserId);

        }

        startActivityForResult(intent, CHOOSE_LOCK_GENERIC_REQUEST);

    }



    protected Intent getChooseLockIntent() {

        return new Intent(this, ChooseLockGeneric.class);

    }



    private void launchFindSensor(byte[] token) {

        Intent intent = getFindSensorIntent();

        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);

        if (mUserId != UserHandle.USER_NULL) {

            intent.putExtra(Intent.EXTRA_USER_ID, mUserId);

        }

        startActivity(intent);

        finish();

    }



    protected Intent getFindSensorIntent() {

        return new Intent(this, FingerprintEnrollFindSensor.class);

    }



    @Override

    protected int getMetricsCategory() {

        return MetricsLogger.FINGERPRINT_ENROLL_ONBOARD;

    }

}