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

Commit 1cef4545 authored by Milton Wu's avatar Milton Wu
Browse files

Update fingerprint introduction string 

Update introduction string to show device name

Bug: 251727719
Test: Manually check FingerprintEnrollIntroduction and
      FingerprintSettings page
Change-Id: Ie44a5e3e41e0ff2acaaa2388b04068b218da1c67
parent 001aae8d

res-product/values/strings.xml

+2 −6
Original line number Diff line number Diff line
@@ -155,12 +155,8 @@ 
    <string name="security_settings_face_enroll_introduction_control_consent_message" product="tablet"></string>

    <!-- Message on the face enrollment introduction page that explains privacy controls for face unlock when asking for parental consent. [CHAR LIMIT=NONE] -->

    <string name="security_settings_face_enroll_introduction_control_consent_message" product="device"></string>

    <!-- Introduction detail message shown in fingerprint enrollment dialog (tablet) [CHAR LIMIT=NONE]-->

    <string name="security_settings_fingerprint_enroll_introduction_v2_message" product="tablet">Use your fingerprint to unlock your tablet or verify it\u2019s you, like when you sign in to apps or approve a purchase.</string>

    <!-- Introduction detail message shown in fingerprint enrollment dialog (device) [CHAR LIMIT=NONE]-->

    <string name="security_settings_fingerprint_enroll_introduction_v2_message" product="device">Use your fingerprint to unlock your device or verify it\u2019s you, like when you sign in to apps or approve a purchase.</string>

    <!-- Introduction detail message shown in fingerprint enrollment dialog (default) [CHAR LIMIT=NONE]-->

    <string name="security_settings_fingerprint_enroll_introduction_v2_message" product="default">Use your fingerprint to unlock your phone or verify it\u2019s you, like when you sign in to apps or approve a purchase.</string>

    <!-- Introduction detail message shown in fingerprint enrollment dialog [CHAR LIMIT=NONE]-->

    <string name="security_settings_fingerprint_enroll_introduction_v3_message">Use your fingerprint to unlock your <xliff:g id="deviceName" example="Pixel">%s</xliff:g> or verify it\u2019s you, like when you sign in to apps or approve a purchase</string>

    <!-- Introduction detail message shown in fingerprint enrollment dialog when asking for parental consent [CHAR LIMIT=NONE]-->

    <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="default">Allow your child to use their fingerprint to unlock their phone or verify it\u2019s them. This happens when they sign in to apps, approve a purchase, and more.</string>

    <!-- Introduction detail message shown in fingerprint enrollment dialog when asking for parental consent [CHAR LIMIT=NONE]-->

res/layout/fingerprint_enroll_introduction.xml

+1 −2
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ 
    style="?attr/fingerprint_layout_theme"

    android:id="@+id/setup_wizard_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    app:sudDescriptionText="@string/security_settings_fingerprint_enroll_introduction_v2_message">

    android:layout_height="match_parent">



    <LinearLayout

        style="@style/SudContentFrame"

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java

+10 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import com.android.settingslib.RestrictedLockUtilsInternal; 
import com.google.android.setupcompat.template.FooterButton;

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

import com.google.android.setupdesign.span.LinkSpan;

import com.google.android.setupdesign.util.DeviceHelper;



import java.util.List;
@@ -151,6 +152,15 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { 
        }

    }



    @Override

    protected void initViews() {

        setDescriptionText(getString(

                R.string.security_settings_fingerprint_enroll_introduction_v3_message,

                DeviceHelper.getDeviceName(this)));



        super.initViews();

    }



    @VisibleForTesting

    @Nullable

    protected FingerprintManager getFingerprintManager() {

src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java

+5 −2
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ import com.android.settingslib.transition.SettingsTransitionHelper; 
import com.android.settingslib.widget.FooterPreference;

import com.android.settingslib.widget.TwoTargetPreference;



import com.google.android.setupdesign.util.DeviceHelper;



import java.util.ArrayList;

import java.util.HashMap;

import java.util.List;
@@ -451,8 +453,9 @@ public class FingerprintSettings extends SubSettings { 
                mFooterColumns.add(column2);

            } else {

                final FooterColumn column = new FooterColumn();

                column.mTitle = getText(

                        R.string.security_settings_fingerprint_enroll_introduction_v2_message);

                column.mTitle = getString(

                        R.string.security_settings_fingerprint_enroll_introduction_v3_message,

                        DeviceHelper.getDeviceName(getActivity()));

                column.mLearnMoreClickListener = learnMoreClickListener;

                mFooterColumns.add(column);

            }

src/com/android/settings/biometrics2/ui/view/FingerprintEnrollIntroFragment.java

+4 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ import com.google.android.setupcompat.template.FooterBarMixin; 
import com.google.android.setupcompat.template.FooterButton;

import com.google.android.setupdesign.GlifLayout;

import com.google.android.setupdesign.template.RequireScrollMixin;

import com.google.android.setupdesign.util.DeviceHelper;

import com.google.android.setupdesign.util.DynamicColorPalette;



/**
@@ -177,6 +178,9 @@ public class FingerprintEnrollIntroFragment extends Fragment { 
        } else {

            glifLayoutHelper.setHeaderText(

                    R.string.security_settings_fingerprint_enroll_introduction_title);

            glifLayoutHelper.setDescriptionText(getString(

                    R.string.security_settings_fingerprint_enroll_introduction_v3_message,

                    DeviceHelper.getDeviceName(context)));

        }

        observePageStatusLiveDataIfNeed();

    }