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

Commit 5a750fc1 authored by Curtis Belmonte's avatar Curtis Belmonte Committed by Automerger Merge Worker
Browse files

Merge "Support "less secure" info row on face enroll intro" into sc-v2-dev am:... 

Merge "Support "less secure" info row on face enroll intro" into sc-v2-dev am: 6368379a am: b7838414

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15900429

Change-Id: I12233ebe1ebc817b99c337df6266efc9e1b5f870
parents d5e799cb b7838414

res/layout/face_enroll_introduction.xml

+23 −0
Original line number Diff line number Diff line
@@ -107,6 +107,29 @@ 
                    style="@style/BiometricEnrollIntroMessage" />

            </LinearLayout>



            <LinearLayout

                android:id="@+id/info_row_less_secure"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

                android:visibility="gone">



                <ImageView

                    android:id="@+id/icon_less_secure"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

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

                <Space

                    android:layout_width="16dp"

                    android:layout_height="wrap_content"/>

                <TextView

                    android:id="@+id/info_message_less_secure"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    style="@style/BiometricEnrollIntroMessage"

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

            </LinearLayout>



            <LinearLayout

                android:id="@+id/info_row_require_eyes"

                android:layout_width="match_parent"

res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -269,6 +269,9 @@ 
    <!-- ComponentName to launch a vendor-specific enrollment activity if available -->

    <string name="config_face_enroll" translatable="false"></string>



    <!-- Whether to show the "less secure" info section on the face enroll intro screen -->

    <bool name="config_face_intro_show_less_secure">false</bool>



    <!-- Whether to show the "require eyes" info section on the face enroll intro screen -->

    <bool name="config_face_intro_show_require_eyes">true</bool>

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -793,6 +793,8 @@ 
    <string name="security_settings_face_enroll_introduction_info_looking"></string>

    <!-- Message on the face enrollment introduction page that provides information about what could cause the phone to unlock when asking for parental consent. [CHAR LIMIT=NONE] -->

    <string name="security_settings_face_enroll_introduction_info_consent_looking"></string>

    <!-- Message on the face enrollment introduction page that provides information about the relative security of face for unlocking the phone. [CHAR LIMIT=NONE] -->

    <string name="security_settings_face_enroll_introduction_info_less_secure"></string>

    <!-- Message on the face enrollment introduction page that provides information about how to require eyes to be open for Face Unlock. [CHAR LIMIT=NONE] -->

    <string name="security_settings_face_enroll_introduction_info_gaze"></string>

    <!-- Message on the face enrollment introduction page that provides information about how to require eyes to be open for Face Unlock when asking for parental consent. [CHAR LIMIT=NONE] -->

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

+8 −0
Original line number Diff line number Diff line
@@ -112,6 +112,14 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction { 
        howMessage.setText(getHowMessage());

        inControlMessage.setText(getInControlMessage());



        // Set up and show the "less secure" info section if necessary.

        if (getResources().getBoolean(R.bool.config_face_intro_show_less_secure)) {

            final LinearLayout infoRowLessSecure = findViewById(R.id.info_row_less_secure);

            final ImageView iconLessSecure = findViewById(R.id.icon_less_secure);

            infoRowLessSecure.setVisibility(View.VISIBLE);

            iconLessSecure.getBackground().setColorFilter(getIconColorFilter());

        }



        // Set up and show the "require eyes" info section if necessary.

        if (getResources().getBoolean(R.bool.config_face_intro_show_require_eyes)) {

            final LinearLayout infoRowRequireEyes = findViewById(R.id.info_row_require_eyes);