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

Commit 47d74ccf authored by Curtis Belmonte's avatar Curtis Belmonte
Browse files

Update Face Unlock strings to the latest versions 

Makes the following changes to strings related to Face Unlock:
- Standardize capitalization of "Face Unlock"
- Use latest versions of traffic light face enroll strings
- Use latest versions of combined biometrics settings strings
- Set SUW description strings programmatically instead of in XML

Test: Manually tested Face Unlock traffic light and grid UIs

Bug: 183649070
Change-Id: Ie67978ae2630493a5b03b00c3f8a639066ab8f3a
parent c96c5c68

res/layout/face_enroll_education.xml

+0 −8
Original line number Diff line number Diff line
@@ -31,14 +31,6 @@ 
        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"/>



        <Space android:layout_width="match_parent"

               android:layout_height="0dp"

               android:layout_weight="1"/>

res/values/strings.xml

+135 −63

File changed.

Preview size limit exceeded, changes collapsed.

res/xml/security_settings_combined_biometric.xml

+7 −7
Original line number Diff line number Diff line
@@ -26,13 +26,6 @@ 
        android:key="biometric_ways_to_unlock"

        android:title="@string/biometric_settings_category_ways_to_unlock">



        <Preference

            android:key="biometric_fingerprint_settings"

            android:title="@string/security_settings_fingerprint_preference_title"

            android:summary="@string/summary_placeholder"

            settings:keywords="@string/keywords_fingerprint_settings"

            settings:controller="com.android.settings.biometrics.combination.BiometricFingerprintStatusPreferenceController" />



        <Preference

            android:key="biometric_face_settings"

            android:title="@string/security_settings_face_preference_title"
@@ -40,6 +33,13 @@ 
            settings:keywords="@string/keywords_face_settings"

            settings:controller="com.android.settings.biometrics.combination.BiometricFaceStatusPreferenceController" />



        <Preference

            android:key="biometric_fingerprint_settings"

            android:title="@string/security_settings_fingerprint_preference_title"

            android:summary="@string/summary_placeholder"

            settings:keywords="@string/keywords_fingerprint_settings"

            settings:controller="com.android.settings.biometrics.combination.BiometricFingerprintStatusPreferenceController" />



    </PreferenceCategory>



    <PreferenceCategory

res/xml/security_settings_face.xml

+2 −2
Original line number Diff line number Diff line
@@ -29,12 +29,12 @@ 
        settings:controller="com.android.settings.biometrics.face.FaceUnlockCategoryPreferenceController">

        <com.android.settingslib.RestrictedSwitchPreference

            android:key="security_settings_face_keyguard"

            android:title="@string/security_settings_face_settings_use_face_unlock_phone"

            android:title="@string/biometric_settings_use_biometric_unlock_phone"

            settings:keywords="@string/keywords_face_unlock"

            settings:controller="com.android.settings.biometrics.face.FaceSettingsKeyguardPreferenceController"/>

        <SwitchPreference

            android:key="security_settings_face_app"

            android:title="@string/security_settings_face_settings_use_face_for_apps"

            android:title="@string/biometric_settings_use_biometric_for_apps"

            settings:keywords="@string/keywords_face_unlock"

            settings:controller="com.android.settings.biometrics.face.FaceSettingsAppPreferenceController"/>

        <com.android.settingslib.RestrictedSwitchPreference

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

+28 −9
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.settings.biometrics.face;



import android.annotation.StringRes;

import android.app.settings.SettingsEnums;

import android.content.ComponentName;

import android.content.Intent;
@@ -39,6 +40,7 @@ import com.android.settings.password.ChooseLockSettingsHelper; 
import com.google.android.setupcompat.template.FooterBarMixin;

import com.google.android.setupcompat.template.FooterButton;

import com.google.android.setupcompat.util.WizardManagerHelper;

import com.google.android.setupdesign.GlifLayout;

import com.google.android.setupdesign.view.IllustrationVideoView;



public class FaceEnrollEducation extends BiometricEnrollBase {
@@ -62,22 +64,27 @@ public class FaceEnrollEducation extends BiometricEnrollBase { 
            new CompoundButton.OnCheckedChangeListener() {

                @Override

                public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {

                    int titleRes = isChecked ?

                            R.string.security_settings_face_enroll_education_title_accessibility

                            : R.string.security_settings_face_enroll_education_title;

                    getLayout().setHeaderText(titleRes);

                    setTitle(titleRes);

                    final int headerRes;

                    final int descriptionRes;

                    if (isChecked) {

                        headerRes = R.string

                                .security_settings_face_enroll_education_title_accessibility;

                        descriptionRes = R.string

                                .security_settings_face_enroll_education_message_accessibility;

                    } else {

                        headerRes = R.string.security_settings_face_enroll_education_title;

                        descriptionRes = R.string.security_settings_face_enroll_education_message;

                    }

                    updateHeaders(headerRes, descriptionRes);



                    if (isChecked) {

                        mIllustrationNormal.stop();

                        mIllustrationNormal.setVisibility(View.INVISIBLE);

                        mIllustrationAccessibility.setVisibility(View.VISIBLE);

                        mDescriptionText.setVisibility(View.INVISIBLE);

                    } else {

                        mIllustrationNormal.setVisibility(View.VISIBLE);

                        mIllustrationNormal.start();

                        mIllustrationAccessibility.setVisibility(View.INVISIBLE);

                        mDescriptionText.setVisibility(View.VISIBLE);

                    }

                }

            };
@@ -86,8 +93,11 @@ public class FaceEnrollEducation extends BiometricEnrollBase { 
    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        setContentView(R.layout.face_enroll_education);

        getLayout().setHeaderText(R.string.security_settings_face_enroll_education_title);

        setTitle(R.string.security_settings_face_enroll_education_title);



        final int headerRes = R.string.security_settings_face_enroll_education_title;

        final int descriptionRes = R.string.security_settings_face_enroll_education_message;

        updateHeaders(headerRes, descriptionRes);



        mHandler = new Handler();



        mFaceManager = Utils.getFaceManagerOrNull(this);
@@ -237,4 +247,13 @@ public class FaceEnrollEducation extends BiometricEnrollBase { 
    public int getMetricsCategory() {

        return SettingsEnums.FACE_ENROLL_INTRO;

    }



    private void updateHeaders(@StringRes int headerRes, @StringRes int descriptionRes) {

        final CharSequence headerText = getText(headerRes);

        setTitle(headerText);



        final GlifLayout layout = getLayout();

        layout.setHeaderText(headerText);

        layout.setDescriptionText(descriptionRes);

    }

}