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

Commit 82703baa authored by Kevin Chyn's avatar Kevin Chyn Committed by android-build-merger
Browse files

Merge changes from topic "Face Intro Changes" into qt-dev 

am: 0f65b773

Change-Id: I3868316218a7c6cd22e495f8a497941ab7451fc1
parents 93ff7921 0f65b773

AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -1588,6 +1588,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/drawable/ic_face_enroll_introduction_people.xml

0 → 100644
+42 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2019 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

  -->



<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"

                 xmlns:aapt="http://schemas.android.com/aapt">

    <aapt:attr name="android:drawable">

        <vector android:height="24dp" android:width="24dp" android:viewportHeight="24"

                android:viewportWidth="24"

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

            <group android:name="_R_G">

                <group android:name="_R_G_L_0_G">

                    <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="#000000"

                          android:fillAlpha="1" android:fillType="nonZero"

                          android:pathData=" M15 8 C15,6.58 14.5,5.27 13.67,4.24 C14.09,4.1 14.53,4 15,4 C17.21,4 19,5.79 19,8 C19,10.21 17.21,12 15,12 C14.57,12 14.16,11.91 13.77,11.79 C13.74,11.78 13.71,11.77 13.67,11.76 C14.5,10.73 15,9.42 15,8c  M16.66 13.13 C18.03,14.06 19,15.32 19,17 C19,17 19,20 19,20 C19,20 23,20 23,20 C23,20 23,17 23,17 C23,14.82 19.42,13.53 16.66,13.13c  M9 6 C7.9,6 7,6.9 7,8 C7,9.1 7.9,10 9,10 C10.1,10 11,9.1 11,8 C11,6.9 10.1,6 9,6c  M9 15 C6.3,15 3.2,16.29 3,17.01 C3,17.01 3,18 3,18 C3,18 15,18 15,18 C15,18 15,17 15,17 C14.8,16.29 11.7,15 9,15c  M9 4 C11.21,4 13,5.79 13,8 C13,10.21 11.21,12 9,12 C6.79,12 5,10.21 5,8 C5,5.79 6.79,4 9,4c  M9 13 C11.67,13 17,14.34 17,17 C17,17 17,20 17,20 C17,20 1,20 1,20 C1,20 1,17 1,17 C1,14.34 6.33,13 9,13c "/>

                </group>

            </group>

            <group android:name="time_group"/>

        </vector>

    </aapt:attr>

    <target android:name="time_group">

        <aapt:attr name="android:animation">

            <set android:ordering="together">

                <objectAnimator android:propertyName="translateX" android:duration="2000"

                                android:startOffset="0" android:valueFrom="0" android:valueTo="1"

                                android:valueType="floatType"/>

            </set>

        </aapt:attr>

    </target>

</animated-vector>
 
 No newline at end of file

res/drawable/ic_face_enroll_introduction_shield.xml

0 → 100644
+45 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2019 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

  -->



<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"

                 xmlns:aapt="http://schemas.android.com/aapt">

    <aapt:attr name="android:drawable">

        <vector android:height="24dp" android:width="24dp" android:viewportHeight="24"

                android:viewportWidth="24"

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

            <group android:name="_R_G">

                <group android:name="_R_G_L_0_G">

                    <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="#000000"

                          android:fillAlpha="1" android:fillType="nonZero"

                          android:pathData=" M12 2 C12,2 3.82,5.64 3.82,5.64 C3.82,5.64 3.82,11.09 3.82,11.09 C3.82,16.14 7.31,20.85 12,22 C16.69,20.85 20.18,16.14 20.18,11.09 C20.18,11.09 20.18,5.64 20.18,5.64 C20.18,5.64 12,2 12,2c  M18.18 11.09 C18.18,12.64 17.77,14.14 17.08,15.47 C15.77,14.5 13.4,14 12,14 C10.6,14 8.23,14.5 6.92,15.47 C6.23,14.14 5.82,12.64 5.82,11.09 C5.82,11.09 5.82,6.94 5.82,6.94 C5.82,6.94 12,4.19 12,4.19 C12,4.19 18.18,6.94 18.18,6.94 C18.18,6.94 18.18,11.09 18.18,11.09c "/>

                    <path android:name="_R_G_L_0_G_D_1_P_0" android:fillColor="#000000"

                          android:fillAlpha="1" android:fillType="nonZero"

                          android:pathData=" M12 7.5 C13.66,7.5 15,8.84 15,10.5 C15,12.16 13.66,13.5 12,13.5 C10.34,13.5 9,12.16 9,10.5 C9,8.84 10.34,7.5 12,7.5c "/>

                </group>

            </group>

            <group android:name="time_group"/>

        </vector>

    </aapt:attr>

    <target android:name="time_group">

        <aapt:attr name="android:animation">

            <set android:ordering="together">

                <objectAnimator android:propertyName="translateX" android:duration="2000"

                                android:startOffset="0" android:valueFrom="0" android:valueTo="1"

                                android:valueType="floatType"/>

            </set>

        </aapt:attr>

    </target>

</animated-vector>
 
 No newline at end of file

res/drawable/ic_face_enroll_introduction_visibility.xml

0 → 100644
+45 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2019 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

  -->



<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"

                 xmlns:aapt="http://schemas.android.com/aapt">

    <aapt:attr name="android:drawable">

        <vector android:height="24dp" android:width="24dp" android:viewportHeight="24"

                android:viewportWidth="24"

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

            <group android:name="_R_G">

                <group android:name="_R_G_L_0_G">

                    <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="#000000"

                          android:fillAlpha="1" android:fillType="nonZero"

                          android:pathData=" M12 7 C9.52,7 7.5,9.02 7.5,11.5 C7.5,13.98 9.52,16 12,16 C14.48,16 16.5,13.98 16.5,11.5 C16.5,9.02 14.48,7 12,7c  M12 14.2 C10.51,14.2 9.3,12.99 9.3,11.5 C9.3,10.01 10.51,8.8 12,8.8 C13.49,8.8 14.7,10.01 14.7,11.5 C14.7,12.99 13.49,14.2 12,14.2c "/>

                    <path android:name="_R_G_L_0_G_D_1_P_0" android:fillColor="#000000"

                          android:fillAlpha="1" android:fillType="nonZero"

                          android:pathData=" M12 4 C7,4 2.73,7.11 1,11.5 C2.73,15.89 7,19 12,19 C17,19 21.27,15.89 23,11.5 C21.27,7.11 17,4 12,4c  M12 17 C8.21,17 4.83,14.87 3.18,11.5 C4.83,8.13 8.21,6 12,6 C15.79,6 19.17,8.13 20.82,11.5 C19.17,14.87 15.79,17 12,17c "/>

                </group>

            </group>

            <group android:name="time_group"/>

        </vector>

    </aapt:attr>

    <target android:name="time_group">

        <aapt:attr name="android:animation">

            <set android:ordering="together">

                <objectAnimator android:propertyName="translateX" android:duration="2000"

                                android:startOffset="0" android:valueFrom="0" android:valueTo="1"

                                android:valueType="floatType"/>

            </set>

        </aapt:attr>

    </target>

</animated-vector>
 
 No newline at end of file

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>