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

Commit 28d635d9 authored by Kevin Chyn's avatar Kevin Chyn
Browse files

Update FingerprintEnrollIntro text and icons 

This change uses strings that have already been merged. Anything
requiring string changes will be in a follow-up CL

Bug: 185804815
Test: on-device
Change-Id: I4e3d3631bbb9f976badf9d4a1582456b3cb7fae7
parent 8eec01fc

res/drawable/ic_device_locked_24dp.xml

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

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

  -->



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

    android:width="24dp"

    android:height="24dp"

    android:viewportHeight="24"

    android:viewportWidth="24"

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



    <path android:pathData="M0 0h24v24H0V0z" />

    <path

        android:fillColor="#000000"

        android:pathData="M16 18H6V6h10v1h2V3c0-1.1-0.9-2-2-2L6 1.01C4.9 1.01 4 1.9 4 3v18c0 1.1 0.9

        2 2 2h10c1.1 0 2-0.9 2-2v-4h-2v1zM6

        3h10v1H6V3zm0 18v-1h10v1H6zm13.25-10.5v-0.66c0-1.13-1.03-2.09-2.25-2.09s-2.25 0.96 -2.25

        2.09v0.66H14V16h6v-5.5h-0.75zm-1.5 0h-1.5v-0.66c0-0.29 0.38 -0.59 0.75 -0.59s0.75 0.3 0.75

        0.59 v0.66z" />

</vector>
 
 No newline at end of file

res/drawable/ic_link_24dp.xml

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

<!--

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

  -->



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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24"

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



    <path

        android:pathData="M0 0h24v24H0V0z" />

    <path

        android:fillColor="#000000"

        android:pathData="M17 7h-4v2h4c1.65 0 3 1.35 3 3s-1.35 3-3 3h-4v2h4c2.76 0 5-2.24

        5-5s-2.24-5-5-5zm-6 8H7c-1.65 0-3-1.35-3-3s1.35-3 3-3h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5

        5h4v-2zm-3-4h8v2H8z" />

</vector>
 
 No newline at end of file

res/layout/fingerprint_enroll_introduction.xml

+33 −11
Original line number Diff line number Diff line
@@ -55,13 +55,14 @@ 
            android:layout_height="wrap_content"

            android:orientation="vertical">



            <!-- How it works -->

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

                style="@style/SudDescription.Glif"

                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:text="@string/security_settings_fingerprint_v2_enroll_introduction_footer_title_2" />



            <LinearLayout

                android:layout_width="match_parent"
@@ -73,23 +74,44 @@ 
                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:contentDescription="@null"

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

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

                <Space

                    android:layout_width="24dp"

                    android:layout_height="wrap_content"/>

                <TextView

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

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

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

            </LinearLayout>



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

                android:paddingTop="12dp">



                <ImageView

                    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_height="wrap_content"/>

                <TextView

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

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

            </LinearLayout>



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

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

                style="@style/SudDescription.Glif"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:textAlignment="viewStart"

                android:paddingTop="24dp"

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

                android:paddingTop="12dp"

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



            <LinearLayout

                android:layout_width="match_parent"
@@ -101,34 +123,34 @@ 
                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:contentDescription="@null"

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

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

                <Space

                    android:layout_width="24dp"

                    android:layout_height="wrap_content"/>

                <TextView

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

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

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

            </LinearLayout>



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

                android:paddingTop="24dp">

                android:paddingTop="12dp">



                <ImageView

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:contentDescription="@null"

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

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

                <Space

                    android:layout_width="24dp"

                    android:layout_height="wrap_content"/>

                <TextView

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

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

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

            </LinearLayout>



        </LinearLayout>