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

Commit 483bd692 authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge "4/n: Add basic enrollment for Face"

parents 7adfcf68 ea65b51a

AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -1570,6 +1570,8 @@ 
            android:theme="@style/GlifTheme.Light"/>



        <activity android:name=".biometrics.face.FaceEnrollIntroduction" android:exported="false" />

        <activity android:name=".biometrics.face.FaceEnrollEnrolling" android:exported="false" />

        <activity android:name=".biometrics.face.FaceEnrollFinish" android:exported="false" />



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

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

res/layout/face_enroll_enrolling.xml

0 → 100644
+71 −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.android.setupwizardlib.GlifLayout

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

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

    android:id="@+id/setup_wizard_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    style="?attr/face_layout_theme"

    app:suwFooter="@layout/face_enroll_enrolling_footer">



    <LinearLayout

        style="@style/SuwContentFrame"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical"

        android:clipToPadding="false"

        android:clipChildren="false">



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="1"

            android:gravity="center"

            android:orientation="vertical">



            <com.android.setupwizardlib.view.FillContentLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_weight="1">



                <!-- TODO: replace this with actual content-->

                <ImageView

                    style="@style/SuwContentIllustration"

                    android:layout_width="match_parent"

                    android:layout_height="match_parent"

                    android:contentDescription="@null"

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



            </com.android.setupwizardlib.view.FillContentLayout>



            <TextView

                style="@style/TextAppearance.FaceErrorText"

                android:id="@+id/error_text"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center_horizontal|bottom"

                android:accessibilityLiveRegion="polite"

                android:gravity="center"

                android:visibility="invisible"/>



        </LinearLayout>



    </LinearLayout>



</com.android.setupwizardlib.GlifLayout>
 
 No newline at end of file

res/layout/face_enroll_enrolling_footer.xml

0 → 100644
+31 −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

  -->



<!-- TODO: Use aapt:attr when it is fixed (b/36809755) -->

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

    style="@style/SuwGlifButtonBar"

    android:layout_width="match_parent"

    android:layout_height="wrap_content">



    <Button

        style="@style/SuwGlifButton.Secondary"

        android:id="@+id/skip_button"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

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



</LinearLayout>

res/layout/face_enroll_finish.xml

0 → 100644
+60 −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.android.setupwizardlib.GlifLayout

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

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

    android:id="@+id/setup_wizard_layout"

    style="?attr/face_layout_theme"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    app:suwFooter="@layout/face_enroll_finish_footer">



    <LinearLayout

        style="@style/SuwContentFrame"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical"

        android:clipToPadding="false"

        android:clipChildren="false">



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="1"

            android:gravity="center"

            android:orientation="vertical">



            <com.android.setupwizardlib.view.FillContentLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_weight="1">



                <ImageView

                    style="@style/SuwContentIllustration"

                    android:layout_width="match_parent"

                    android:layout_height="match_parent"

                    android:contentDescription="@null"

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



            </com.android.setupwizardlib.view.FillContentLayout>



        </LinearLayout>



    </LinearLayout>



</com.android.setupwizardlib.GlifLayout>

res/layout/face_enroll_finish_footer.xml

0 → 100644
+37 −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

  -->



<!-- TODO: Use aapt:attr when it is fixed (b/36809755) -->

<com.android.setupwizardlib.view.ButtonBarLayout

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

    style="@style/SuwGlifButtonBar.Stackable"

    android:layout_width="match_parent"

    android:layout_height="wrap_content">



    <Space

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:layout_weight="1" />



    <Button

        style="@style/SuwGlifButton.Primary"

        android:id="@+id/next_button"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

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



</com.android.setupwizardlib.view.ButtonBarLayout>