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

Commit 0458262f authored by joshmccloskey's avatar joshmccloskey Committed by Joshua Mccloskey
Browse files

Added Face Enroll Education Screen 

Test: Builds
Bug: 131774352
Fixes: 131857742

Change-Id: Ib384b9efaf053b405ce3f55e449dd6abb9e75296
parent ac653b98

AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -1570,6 +1570,10 @@ 
            android:exported="false"

            android:screenOrientation="portrait"/>



        <activity android:name=".biometrics.face.FaceEnrollEducation"

            android:exported="false"

            android:screenOrientation="portrait"/>



        <activity android:name=".biometrics.face.FaceEnrollEnrolling"

            android:exported="false"

            android:screenOrientation="portrait"/>

res/layout/face_enroll_education.xml

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

<!--

  ~ Copyright (C) 2018 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.google.android.setupdesign.GlifLayout

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

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

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

    style="?attr/face_layout_theme"

    android:id="@+id/setup_wizard_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <LinearLayout

        style="@style/SudContentFrame"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:orientation="vertical">



        <com.google.android.setupdesign.view.RichTextView

            android:id="@+id/sud_layout_description"

            style="@style/SudDescription.Glif"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:textAlignment="center"

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



        <com.google.android.setupdesign.view.RichTextView

            android:id="@+id/error_text"

            style="@style/SudDescription.Glif"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"/>



        <FrameLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginVertical="48dp">



            <com.google.android.setupdesign.view.IllustrationVideoView

                android:id="@+id/illustration_normal"

                style="@style/SudContentIllustration"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                app:sudVideo="@raw/face_education"/>



            <ImageView

                android:id="@+id/illustration_accessibility"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center"

                android:visibility="invisible"

                android:background="@drawable/face_enroll_introduction"/>



        </FrameLayout>



        <!-- Contains the buttons and extra information text at the bottom -->

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            android:layout_gravity="center_horizontal|bottom">



            <FrameLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content">



                <Button

                    android:id="@+id/accessibility_button"

                    style="@style/SudGlifButton.Secondary"

                    android:layout_gravity="center"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

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



                <com.android.settings.biometrics.face.FaceEnrollAccessibilityToggle

                    android:id="@+id/toggle_diversity"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:visibility="gone"

                    FaceEnrollAccessibilitySwitch:messageText="@string/security_settings_face_enroll_introduction_accessibility_diversity"/>



            </FrameLayout>



        </LinearLayout>



    </LinearLayout>



</com.google.android.setupdesign.GlifLayout>

res/raw/face_education.mp4

0 → 100644
+0 −0

Empty file added.

res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -888,6 +888,12 @@ 
    <string name="security_settings_face_preference_summary_none">Tap to set up face authentication</string>

    <!-- Title shown for menu item that launches face settings or enrollment. [CHAR LIMIT=32] -->

    <string name="security_settings_face_preference_title">Face authentication</string>

    <!-- Introduction title shown in face enrollment education screen [CHAR LIMIT=40] -->

    <string name="security_settings_face_enroll_education_title">How to set up Face unlock</string>

    <!-- Introduction title shown in face enrollment education screen to show the face authentication feature, when face unlock is disabled by device admin [CHAR LIMIT=40] -->

    <string name="security_settings_face_enroll_education_title_unlock_disabled">Use your face to authenticate</string>

    <!-- Introduction detail message shown in face education [CHAR LIMIT=NONE] -->

    <string name="security_settings_face_enroll_education_message"></string>

    <!-- Button shown which shows accessibility toggles for face enrollment when clicked. [CHAR LIMIT=32] -->

    <string name="security_settings_face_enroll_introduction_accessibility">Use accessibility setup</string>

    <!-- Additional details shown when the accessibility toggle is expanded. [CHAR LIMIT=NONE]-->

src/com/android/settings/biometrics/face/FaceEnrollEducation.java

0 → 100644
+175 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 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.biometrics.face;



import static android.provider.Settings.Secure.FACE_UNLOCK_EDUCATION_INFO_DISPLAYED;

import static android.security.KeyStore.getApplicationContext;



import android.app.settings.SettingsEnums;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.hardware.face.FaceManager;

import android.os.Bundle;

import android.os.Handler;

import android.os.UserHandle;

import android.provider.Settings;

import android.text.TextUtils;

import android.view.View;

import android.widget.Button;

import android.widget.CompoundButton;



import com.android.settings.R;

import com.android.settings.Utils;

import com.android.settings.biometrics.BiometricEnrollBase;

import com.android.settings.password.ChooseLockSettingsHelper;



import com.google.android.setupcompat.template.FooterBarMixin;

import com.google.android.setupcompat.template.FooterButton;

import com.google.android.setupcompat.util.WizardManagerHelper;

import com.google.android.setupdesign.view.IllustrationVideoView;



public class FaceEnrollEducation extends BiometricEnrollBase {



    private static final String TAG = "FaceEducation";

    private static final int ON = 1;

    private static final int OFF = 0;

    // 10 seconds.

    private static final long FACE_ENROLL_EDUCATION_DELAY = 16000;



    private FaceManager mFaceManager;

    private FaceEnrollAccessibilityToggle mSwitchDiversity;



    private IllustrationVideoView mIllustrationNormal;

    private View mIllustrationAccessibility;

    private Handler mHandler;



    private CompoundButton.OnCheckedChangeListener mSwitchDiversityListener =

            new CompoundButton.OnCheckedChangeListener() {

                @Override

                public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {

                    if (isChecked) {

                        mIllustrationNormal.stop();

                        mIllustrationNormal.setVisibility(View.INVISIBLE);

                        mIllustrationAccessibility.setVisibility(View.VISIBLE);

                    } else {

                        mIllustrationNormal.setVisibility(View.VISIBLE);

                        mIllustrationNormal.start();

                        mIllustrationAccessibility.setVisibility(View.INVISIBLE);

                    }

                }

            };



    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        setContentView(R.layout.face_enroll_education);

        getLayout().setHeaderText(R.string.security_settings_face_enroll_education_title);

        setTitle(R.string.security_settings_face_enroll_education_title);

        mHandler = new Handler();



        mFaceManager = Utils.getFaceManagerOrNull(this);

        final Button accessibilityButton = findViewById(R.id.accessibility_button);

        accessibilityButton.setOnClickListener(view -> {

            mSwitchDiversity.setChecked(true);

            accessibilityButton.setVisibility(View.GONE);

            mSwitchDiversity.setVisibility(View.VISIBLE);

        });



        mSwitchDiversity = findViewById(R.id.toggle_diversity);

        mSwitchDiversity.setListener(mSwitchDiversityListener);



        mIllustrationNormal = findViewById(R.id.illustration_normal);

        mIllustrationAccessibility = findViewById(R.id.illustration_accessibility);



        mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);

        mFooterBarMixin.setSecondaryButton(

                new FooterButton.Builder(this)

                        .setText(R.string.security_settings_face_enroll_enrolling_skip)

                        .setListener(this::onSkipButtonClick)

                        .setButtonType(FooterButton.ButtonType.SKIP)

                        .setTheme(R.style.SudGlifButton_Secondary)

                        .build()

        );



        final FooterButton footerButton = new FooterButton.Builder(this)

                .setText(R.string.wizard_next)

                .setListener(this::onNextButtonClick)

                .setButtonType(FooterButton.ButtonType.NEXT)

                .setTheme(R.style.SudGlifButton_Primary)

                .build();



        mFooterBarMixin.setPrimaryButton(footerButton);

        final Context context = getApplicationContext();

        final boolean didDisplayEdu = Settings.Secure.getIntForUser(context.getContentResolver(),

                FACE_UNLOCK_EDUCATION_INFO_DISPLAYED, OFF, mUserId) == ON;

        if (!didDisplayEdu) {

            Settings.Secure.putIntForUser(context.getContentResolver(),

                    FACE_UNLOCK_EDUCATION_INFO_DISPLAYED, ON, mUserId);

            footerButton.setEnabled(false);

            mHandler.postDelayed(() -> {

                footerButton.setEnabled(true);

            }, FACE_ENROLL_EDUCATION_DELAY);

        }

    }



    @Override

    protected void onResume() {

        super.onResume();

        mSwitchDiversityListener.onCheckedChanged(mSwitchDiversity.getSwitch(),

                mSwitchDiversity.isChecked());

    }



    @Override

    protected void onNextButtonClick(View view) {

        final Intent intent = new Intent();

        if (mToken != null) {

            intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);

        }

        if (mUserId != UserHandle.USER_NULL) {

            intent.putExtra(Intent.EXTRA_USER_ID, mUserId);

        }

        final String flattenedString = getString(R.string.config_face_enroll);

        if (!TextUtils.isEmpty(flattenedString)) {

            ComponentName componentName = ComponentName.unflattenFromString(flattenedString);

            intent.setComponent(componentName);

        } else {

            intent.setClass(this, FaceEnrollEnrolling.class);

        }

        intent.putExtra(EXTRA_KEY_REQUIRE_DIVERSITY, !mSwitchDiversity.isChecked());

        WizardManagerHelper.copyWizardManagerExtras(getIntent(), intent);

        startActivityForResult(intent, BIOMETRIC_FIND_SENSOR_REQUEST);

    }



    protected void onSkipButtonClick(View view) {

        setResult(RESULT_SKIP);

        finish();

    }



    @Override

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

        if (requestCode == BIOMETRIC_FIND_SENSOR_REQUEST) {

            setResult(resultCode);

            finish();

        }

    }



    @Override

    public int getMetricsCategory() {

        return SettingsEnums.FACE_ENROLL_INTRO;

    }

}