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

Commit 0fcac8bf authored by Joe Bolinger's avatar Joe Bolinger Committed by Android (Google) Code Review
Browse files

Merge changes from topic "unicorn-1" into sc-dev 

* changes:
  Update strings for parental consent flow in setup wizard.
  Add plumbing and placeholder screens for parental consent flow.
parents d6b3885e 4af5a364

AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -1803,6 +1803,10 @@ 
            android:theme="@style/GlifV3Theme.Light"

            android:exported="false"/>



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

                  android:exported="false"

                  android:screenOrientation="portrait"/>



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

            android:exported="false"

            android:screenOrientation="portrait"/>
@@ -1837,6 +1841,7 @@ 
        <activity android:name=".biometrics.fingerprint.FingerprintEnrollFindSensor" android:exported="false"/>

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

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

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

        <activity android:name=".biometrics.fingerprint.FingerprintEnrollIntroduction"

            android:exported="true"

            android:theme="@style/GlifTheme.Light">

res/drawable/ic_face_enroll_introduction_shield.xml

deleted100644 → 0
+0 −45
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/layout/face_enroll_introduction.xml

+16 −46
Original line number Diff line number Diff line
@@ -30,7 +30,9 @@ 
        android:layout_height="wrap_content"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:orientation="vertical">

        android:orientation="vertical"

        android:layout_marginStart="?attr/sudMarginStart"

        android:layout_marginEnd="?attr/sudMarginEnd">



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

            android:id="@+id/error_text"
@@ -60,6 +62,7 @@ 
            android:layout_height="wrap_content"

            android:orientation="vertical">



            <!-- Keep in mind -->

            <TextView

                android:layout_width="match_parent"

                android:layout_height="wrap_content"
@@ -78,19 +81,15 @@ 
                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

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



                <Space

                    android:layout_width="16dp"

                    android:layout_height="wrap_content"/>



                <TextView

                    android:id="@+id/info_message_glasses"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:text="@string/security_settings_face_enroll_introduction_info_glasses"

                    android:textColor="?android:attr/textColorPrimary"

                    android:textSize="16sp"

                    android:lineSpacingExtra="4sp"/>



                    android:textSize="16sp"/>

            </LinearLayout>



            <LinearLayout
@@ -104,56 +103,28 @@ 
                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

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



                <Space

                    android:layout_width="16dp"

                    android:layout_height="wrap_content"/>



                <TextView

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:text="@string/security_settings_face_enroll_introduction_info_looking"

                    android:textColor="?android:attr/textColorPrimary"

                    android:textSize="16sp"

                    android:lineSpacingExtra="4sp"/>



            </LinearLayout>



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

                android:paddingTop="24dp">



                <ImageView

                    android:id="@+id/icon_security"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

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



                <Space

                    android:layout_width="16dp"

                    android:layout_height="wrap_content"/>



                <TextView

                    android:id="@+id/info_message_looking"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:text="@string/security_settings_face_enroll_introduction_info_security"

                    android:textColor="?android:attr/textColorPrimary"

                    android:textSize="16sp"

                    android:lineSpacingExtra="4sp"/>



                    android:textSize="16sp"/>

            </LinearLayout>



            <Space

                android:layout_width="match_parent"

                android:layout_height="40dp"/>



            <!-- How it works -->

            <TextView

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:text="@string/security_settings_face_enroll_introduction_how_title"

                android:textColor="?android:attr/textColorPrimary"

                android:textAppearance="?android:attr/textAppearanceMedium"

                android:textSize="20sp"/>



            <Space
@@ -161,21 +132,21 @@ 
                android:layout_height="24dp"/>



            <TextView

                android:id="@+id/how_message"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:text="@string/security_settings_face_enroll_introduction_how_message"

                android:textColor="?android:attr/textColorPrimary"

                android:textSize="14sp"

                android:lineSpacingExtra="2sp"/>

                android:textSize="16sp"/>



            <Space

                android:layout_width="match_parent"

                android:layout_height="24dp"/>



            <!-- You're in control -->

            <TextView

                android:id="@+id/title_in_control"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:text="@string/security_settings_face_enroll_introduction_control_title"

                android:textColor="?android:attr/textColorPrimary"

                android:textSize="20sp"/>
@@ -184,12 +155,11 @@ 
                android:layout_height="24dp"/>



            <TextView

                android:id="@+id/message_in_control"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:text="@string/security_settings_face_enroll_introduction_control_message"

                android:textColor="?android:attr/textColorPrimary"

                android:textSize="14sp"

                android:lineSpacingExtra="2sp"/>

                android:textSize="16sp"/>



        </LinearLayout>

res/layout/fingerprint_enroll_introduction.xml

+83 −72
Original line number Diff line number Diff line
@@ -30,7 +30,9 @@ 
        android:layout_height="wrap_content"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:orientation="vertical">

        android:orientation="vertical"

        android:layout_marginStart="?attr/sudMarginStart"

        android:layout_marginEnd="?attr/sudMarginEnd">



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

            android:id="@+id/error_text"
@@ -52,26 +54,25 @@ 


        </FrameLayout>



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

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical">



            <!-- How it works -->

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

                style="@style/SudDescription.Glif"

            <TextView

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:textAlignment="viewStart"

                android:paddingTop="12dp"

                android:text="@string/security_settings_fingerprint_v2_enroll_introduction_footer_title_2"

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

                android:textColor="?android:attr/textColorPrimary"

                android:textSize="20sp"/>



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

                android:paddingTop="12dp">

                android:paddingTop="24dp">



                <ImageView

                    android:id="@+id/icon_fingerprint"
@@ -80,86 +81,92 @@ 
                    android:contentDescription="@null"

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

                <Space

                    android:layout_width="24dp"

                    android:layout_width="16dp"

                    android:layout_height="wrap_content"/>

                <TextView

                    android:id="@+id/footer_message_2"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:text="@string/security_settings_fingerprint_v2_enroll_introduction_footer_message_2"

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

                    android:textColor="?android:attr/textColorPrimary"

                    android:textSize="16sp"/>

            </LinearLayout>



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

                android:paddingTop="12dp">

                android:paddingTop="24dp">



                <ImageView

                    android:id="@+id/icon_locked"

                    android:id="@+id/icon_fingerprint"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:contentDescription="@null"

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

                <Space

                    android:layout_width="24dp"

                    android:layout_width="16dp"

                    android:layout_height="wrap_content"/>

                <TextView

                    android:id="@+id/footer_message_3"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:text="@string/security_settings_fingerprint_v2_enroll_introduction_footer_message_3"

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

                    android:textColor="?android:attr/textColorPrimary"

                    android:textSize="16sp"/>

            </LinearLayout>



            <Space

                android:layout_width="match_parent"

                android:layout_height="24dp"/>



            <!-- You're in control -->

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

                style="@style/SudDescription.Glif"

            <TextView

                android:id="@+id/footer_title_1"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:textAlignment="viewStart"

                android:paddingTop="12dp"

                android:text="@string/security_settings_fingerprint_enroll_introduction_footer_title_1"

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

                android:textColor="?android:attr/textColorPrimary"

                android:textSize="20sp"/>



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

                android:paddingTop="12dp">

                android:paddingTop="24dp">



                <ImageView

                    android:id="@+id/icon_delete"

                    android:id="@+id/icon_fingerprint"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:contentDescription="@null"

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

                <Space

                    android:layout_width="24dp"

                    android:layout_width="16dp"

                    android:layout_height="wrap_content"/>

                <TextView

                    android:id="@+id/footer_message_4"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:text="@string/security_settings_fingerprint_v2_enroll_introduction_footer_message_4"

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

                    android:textColor="?android:attr/textColorPrimary"

                    android:textSize="16sp"/>

            </LinearLayout>



        </LinearLayout>

            <Space

                android:layout_width="match_parent"

                android:layout_height="24dp"/>



            <!-- Keep in mind -->

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

            style="@style/SudDescription.Glif"

            <TextView

                android:id="@+id/footer_title_2"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

            android:textAlignment="viewStart"

            android:paddingTop="12dp"

            android:text="@string/security_settings_fingerprint_enroll_introduction_footer_title_2"

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

                android:text="@string/security_settings_face_enroll_introduction_info_title"

                android:textColor="?android:attr/textColorPrimary"

                android:textSize="20sp"/>



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

            android:paddingTop="12dp">

                android:paddingTop="24dp">



                <ImageView

                    android:id="@+id/icon_info"
@@ -168,20 +175,21 @@ 
                    android:contentDescription="@null"

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

                <Space

                android:layout_width="24dp"

                    android:layout_width="16dp"

                    android:layout_height="wrap_content"/>

                <TextView

                    android:id="@+id/footer_message_5"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                android:text="@string/security_settings_fingerprint_v2_enroll_introduction_footer_message_5"

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

                    android:textColor="?android:attr/textColorPrimary"

                    android:textSize="16sp"/>

            </LinearLayout>



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

            android:paddingTop="12dp">

                android:paddingTop="24dp">



                <ImageView

                    android:id="@+id/icon_link"
@@ -190,13 +198,16 @@ 
                    android:contentDescription="@null"

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

                <Space

                android:layout_width="24dp"

                    android:layout_width="16dp"

                    android:layout_height="wrap_content"/>

                <TextView

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:text="@string/security_settings_fingerprint_v2_enroll_introduction_message_learn_more"

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

                    android:textColor="?android:attr/textColorPrimary"

                    android:textSize="16sp"/>

            </LinearLayout>



        </LinearLayout>



    </LinearLayout>

res/values/strings.xml

+35 −9

File changed.

Preview size limit exceeded, changes collapsed.