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

Commit f25830b9 authored by Kevin Chyn's avatar Kevin Chyn
Browse files

Update enrollment intro 

1) Toggles resources between normal and accessibility enrollment
2) Add footer for more detail text

Fixes: 127514618
Bug: 111548033

Test: Builds

Change-Id: Ib0c47f04abc5ce9abbd8b27ef5782d1874379f16
parent 7d7b09ab

res/drawable/face_enroll_introduction.xml

+26 −5
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2018 The Android Open Source Project

  ~
@@ -15,9 +16,29 @@ 
  -->



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

    android:height="24dp"

    android:width="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

    <path android:fillColor="#000" android:pathData="M9,11.75A1.25,1.25 0 0,0 7.75,13A1.25,1.25 0 0,0 9,14.25A1.25,1.25 0 0,0 10.25,13A1.25,1.25 0 0,0 9,11.75M15,11.75A1.25,1.25 0 0,0 13.75,13A1.25,1.25 0 0,0 15,14.25A1.25,1.25 0 0,0 16.25,13A1.25,1.25 0 0,0 15,11.75M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M12,20C7.59,20 4,16.41 4,12C4,11.71 4,11.42 4.05,11.14C6.41,10.09 8.28,8.16 9.26,5.77C11.07,8.33 14.05,10 17.42,10C18.2,10 18.95,9.91 19.67,9.74C19.88,10.45 20,11.21 20,12C20,16.41 16.41,20 12,20Z" />

    android:width="240dp"

    android:height="240dp"

    android:viewportWidth="300"

    android:viewportHeight="300">



    <path

        android:fillColor="#DADCE0"

        android:fillType="evenOdd"

        android:pathData="M150,0C67.16,0,0,67.16,0,150s67.16,150,150,150 s150-67.16,150-150S232.84,0,150,0 M150,4c39,0,75.66,15.19,103.24,42.76C280.81,74.34,296,111,296,150s-15.19,75.66-42.76,103.24 C225.66,280.81,189,296,150,296s-75.66-15.19-103.24-42.76C19.19,225.66,4,189,4,150S19.19,74.34,46.76,46.76 C74.34,19.19,111,4,150,4" />

    <path

        android:fillColor="?android:attr/colorAccent"

        android:fillType="evenOdd"

        android:pathData="M220,120c0,5.52-4.48,10-10,10s-10-4.48-10-10 s4.48-10,10-10S220,114.48,220,120" />

    <path

        android:fillColor="?android:attr/colorAccent"

        android:fillType="evenOdd"

        android:pathData="M90,130c-5.52,0-10-4.48-10-10s4.48-10,10-10 s10,4.48,10,10S95.52,130,90,130" />

    <path

        android:fillColor="?android:attr/colorAccent"

        android:fillType="evenOdd"

        android:pathData="M164.2,215.88c-3.83,3.25-8.79,5.22-14.2,5.22 c-12.13,0-22-9.87-22-22c0-0.03,0-0.06,0-0.09l-8-0.03c0,0.04,0,0.08,0,0.13c0,6.24,1.9,12.03,5.16,16.83 c5.4,7.95,14.51,13.17,24.84,13.17c1.04,0,2.06-0.05,3.08-0.15c6.18-0.63,11.81-3.14,16.3-6.95L164.2,215.88z" />

    <path

        android:fillColor="?android:attr/colorAccent"

        android:fillType="evenOdd"

        android:pathData="M 153 140 L 153 166 L 137 166 L 137 174 L 161 174 L 161 140 Z" />

</vector>
 
 No newline at end of file

res/drawable/ic_face_enroll_introduction_detail.xml

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

<!--

  ~ 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

  -->



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

    android:width="24dp"

    android:height="24dp"

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

    android:viewportWidth="24"

    android:viewportHeight="24">



    <path

        android:pathData="M0 0h24v24H0V0z" />

    <path

        android:fillColor="#000000"

        android:pathData="M11 15h2v2h-2zm0-8h2v6h-2zm0.99-5C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z" />

</vector>
 
 No newline at end of file

res/layout/face_enroll_introduction.xml

+63 −26
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
    <LinearLayout

        style="@style/SudContentFrame"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="match_parent"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:orientation="vertical">
@@ -45,26 +45,47 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content" />



        <com.google.android.setupdesign.view.FillContentLayout

        <Space

            android:layout_width="0dp"

            android:layout_height="0dp"

            android:layout_weight="1"/>



        <FrameLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_weight="1">

            android:layout_height="wrap_content">



            <com.google.android.setupdesign.view.IllustrationVideoView

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

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

                android:id="@+id/face_enroll_introduction_animation"

                android:id="@+id/illustration_normal"

                style="@style/SudContentIllustration"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_width="240dp"

                android:layout_height="240dp"

                app:sudVideo="@raw/face_enroll_introduction_animation" />



        </com.google.android.setupdesign.view.FillContentLayout>

            <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>



        <FrameLayout

        <Space

            android:layout_width="0dp"

            android:layout_height="0dp"

            android:layout_weight="2"/>



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

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="center">

            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"
@@ -73,22 +94,38 @@ 
                    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="invisible"

                    FaceEnrollAccessibilitySwitch:messageText="@string/security_settings_face_enroll_introduction_accessibility_diversity"/>



            </FrameLayout>



            <LinearLayout

                android:id="@+id/footer_layout"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_gravity="center"

                android:id="@+id/accessibility_layout"

                android:orientation="vertical"

                android:visibility="invisible">

                android:orientation="horizontal"

                android:paddingStart="16dp"

                android:paddingEnd="16dp">



                <com.android.settings.biometrics.face.FaceEnrollAccessibilityToggle

                    android:id="@+id/toggle_diversity"

                <ImageView

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:background="@drawable/ic_face_enroll_introduction_detail">

                </ImageView>

                <Space

                    android:layout_width="8dp"

                    android:layout_height="wrap_content" />

                <TextView

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    FaceEnrollAccessibilitySwitch:messageText="@string/security_settings_face_enroll_introduction_accessibility_diversity"/>

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

            </LinearLayout>



        </LinearLayout>

        </FrameLayout>



    </LinearLayout>

res/values/strings.xml

+3 −1
Original line number Diff line number Diff line
@@ -898,8 +898,10 @@ 
    <string name="security_settings_face_enroll_introduction_message">Use your face to unlock your phone, authorize purchases, or sign in to apps.</string>

    <!-- Introduction detail message shown in face enrollment dialog, when face unlock is disabled by device admin [CHAR LIMIT=NONE] -->

    <string name="security_settings_face_enroll_introduction_message_unlock_disabled">Use your face to unlock your phone or approve purchases.\n\nNote: You can\u2019t use your face to unlock this device. For more information, contact your organization\u2019s admin.</string>

    <!-- Introduction detail message shwon in face enrollment screen in setup wizard. [CHAR LIMIT=NONE] -->

    <!-- Introduction detail message shown in face enrollment screen in setup wizard. [CHAR LIMIT=NONE] -->

    <string name="security_settings_face_enroll_introduction_message_setup">Use your face to unlock your phone, authorize purchases, or sign in to apps</string>

    <!-- Introduction detail message shown in face enrollment that provides extra detais. [CHAR LIMIT=NONE] -->

    <string name="security_settings_face_enroll_introduction_footer_message"></string>

    <!-- Title shown in face enrollment dialog [CHAR LIMIT=40] -->

    <string name="security_settings_face_enroll_repeat_title">Center your face in the circle</string>

    <!-- Button text to skip enrollment of face [CHAR LIMIT=40] -->

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

+9 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.content.Context; 
import android.content.res.TypedArray;

import android.util.AttributeSet;

import android.view.LayoutInflater;

import android.widget.CompoundButton;

import android.widget.LinearLayout;

import android.widget.Switch;

import android.widget.TextView;
@@ -68,4 +69,12 @@ public class FaceEnrollAccessibilityToggle extends LinearLayout { 
    public void setChecked(boolean checked) {

        mSwitch.setChecked(checked);

    }



    public void setListener(CompoundButton.OnCheckedChangeListener listener) {

        mSwitch.setOnCheckedChangeListener(listener);

    }



    public Switch getSwitch() {

        return mSwitch;

    }

}