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

Commit 4314866a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update strings for pattern screens"

parents 373cbeb3 7f5e1960

res/layout-land/choose_lock_pattern.xml

+9 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
                style="@style/SuwGlifIcon"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="?attr/suwGlifHeaderGravity"

                android:layout_marginStart="0dp"

                android:layout_marginEnd="0dp"

                android:src="@drawable/ic_lock"/>
@@ -71,13 +72,20 @@ 
                        android:layout_marginStart="0dp"

                        android:layout_marginEnd="0dp"/>



                    <TextView

                        android:id="@+id/message"

                        style="@style/SuwDescription.Glif"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:minLines="2" />



                    <!-- header message -->

                    <TextView

                        android:id="@+id/headerText"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:layout_marginTop="16dp"

                        android:gravity="start|bottom"

                        android:gravity="?attr/suwGlifHeaderGravity"

                        android:textSize="18sp"/>



                </LinearLayout>

res/layout-land/confirm_lock_pattern_internal.xml

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
                    style="@style/SuwGlifIcon"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_gravity="?attr/suwGlifHeaderGravity"

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



                <TextView

res/layout/choose_lock_pattern_common.xml

+7 −0
Original line number Diff line number Diff line
@@ -68,6 +68,13 @@ 
            android:paddingLeft="0dp"

            android:paddingRight="0dp">



            <TextView

                android:id="@+id/message"

                style="@style/SuwDescription.Glif"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:minLines="2" />



            <TextView android:id="@+id/headerText"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -3437,14 +3437,14 @@ 
    <string name="lockpassword_choose_your_password_message">For security, set a password</string>

    <!-- Header on first screen of choose password/PIN as backup for fingerprint flow. If this string cannot be translated in under 40 characters, please translate "Set fingerprint backup" [CHAR LIMIT=40] -->

    <string name="lockpassword_choose_your_password_header_for_fingerprint">To use fingerprint, set password</string>

    <!-- Header on first screen of choose pattern flow [CHAR LIMIT=40] -->

    <string name="lockpassword_choose_your_pattern_header">Choose your pattern</string>

    <!-- Header on first screen of choose pattern as backup for fingerprint flow. If this string cannot be translated in under 40 characters, please translate "Set fingerprint backup" [CHAR LIMIT=40] -->

    <string name="lockpassword_choose_your_pattern_header_for_fingerprint">To use fingerprint, set pattern</string>

    <!-- Message on first screen of choose PIN flow [CHAR LIMIT=NONE] -->

    <string name="lockpassword_choose_your_pin_message">For security, set a PIN</string>

    <!-- Header on first screen of choose password/PIN as backup for fingerprint flow. If this string cannot be translated in under 40 characters, please translate "Set fingerprint backup" [CHAR LIMIT=40] -->

    <string name="lockpassword_choose_your_pin_header_for_fingerprint">To use fingerprint, set PIN</string>

    <!-- Message on first screen of choose pattern flow [CHAR LIMIT=NONE] -->

    <string name="lockpassword_choose_your_pattern_message">For security, set a pattern</string>

    <!-- Header on password confirm screen [CHAR LIMIT=40] -->

    <string name="lockpassword_confirm_your_password_header">Re-enter your password</string>

    <!-- Header on pattern confirm screen [CHAR LIMIT=30] -->

src/com/android/settings/password/ChooseLockPattern.java

+27 −6
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ public class ChooseLockPattern extends SettingsActivity { 
        boolean forFingerprint = getIntent()

                .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, false);

        setTitle(forFingerprint ? R.string.lockpassword_choose_your_pattern_header_for_fingerprint

                : R.string.lockpassword_choose_your_pattern_header);

                : R.string.lockpassword_choose_your_screen_lock_header);

        LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);

        layout.setFitsSystemWindows(false);

    }
@@ -172,6 +172,7 @@ public class ChooseLockPattern extends SettingsActivity { 
        private boolean mHasChallenge;

        private long mChallenge;

        protected TextView mHeaderText;

        protected TextView mMessageText;

        protected LockPatternView mLockPatternView;

        protected TextView mFooterText;

        private TextView mFooterLeftButton;
@@ -338,44 +339,55 @@ public class ChooseLockPattern extends SettingsActivity { 
        protected enum Stage {



            Introduction(

                    R.string.lock_settings_picker_fingerprint_added_security_message,

                    R.string.lockpassword_choose_your_pattern_message,

                    R.string.lockpattern_recording_intro_header,

                    LeftButtonMode.Cancel, RightButtonMode.ContinueDisabled,

                    ID_EMPTY_MESSAGE, true),

            HelpScreen(

                    R.string.lockpattern_settings_help_how_to_record,

                    ID_EMPTY_MESSAGE, ID_EMPTY_MESSAGE, R.string.lockpattern_settings_help_how_to_record,

                    LeftButtonMode.Gone, RightButtonMode.Ok, ID_EMPTY_MESSAGE, false),

            ChoiceTooShort(

                    R.string.lock_settings_picker_fingerprint_added_security_message,

                    R.string.lockpassword_choose_your_pattern_message,

                    R.string.lockpattern_recording_incorrect_too_short,

                    LeftButtonMode.Retry, RightButtonMode.ContinueDisabled,

                    ID_EMPTY_MESSAGE, true),

            FirstChoiceValid(

                    R.string.lock_settings_picker_fingerprint_added_security_message,

                    R.string.lockpassword_choose_your_pattern_message,

                    R.string.lockpattern_pattern_entered_header,

                    LeftButtonMode.Retry, RightButtonMode.Continue, ID_EMPTY_MESSAGE, false),

            NeedToConfirm(

                    R.string.lockpattern_need_to_confirm,

                    ID_EMPTY_MESSAGE, ID_EMPTY_MESSAGE, R.string.lockpattern_need_to_confirm,

                    LeftButtonMode.Cancel, RightButtonMode.ConfirmDisabled,

                    ID_EMPTY_MESSAGE, true),

            ConfirmWrong(

                    R.string.lockpattern_need_to_unlock_wrong,

                    ID_EMPTY_MESSAGE, ID_EMPTY_MESSAGE, R.string.lockpattern_need_to_unlock_wrong,

                    LeftButtonMode.Cancel, RightButtonMode.ConfirmDisabled,

                    ID_EMPTY_MESSAGE, true),

            ChoiceConfirmed(

                    R.string.lockpattern_pattern_confirmed_header,

                    ID_EMPTY_MESSAGE, ID_EMPTY_MESSAGE, R.string.lockpattern_pattern_confirmed_header,

                    LeftButtonMode.Cancel, RightButtonMode.Confirm, ID_EMPTY_MESSAGE, false);





            /**

             * @param messageForFingerprint The message displayed at the top, above header for

             *                              fingerprint flow.

             * @param message The message displayed at the top.

             * @param headerMessage The message displayed at the top.

             * @param leftMode The mode of the left button.

             * @param rightMode The mode of the right button.

             * @param footerMessage The footer message.

             * @param patternEnabled Whether the pattern widget is enabled.

             */

            Stage(int headerMessage,

            Stage(int messageForFingerprint, int message, int headerMessage,

                    LeftButtonMode leftMode,

                    RightButtonMode rightMode,

                    int footerMessage, boolean patternEnabled) {

                this.headerMessage = headerMessage;

                this.messageForFingerprint = messageForFingerprint;

                this.message = message;

                this.leftMode = leftMode;

                this.rightMode = rightMode;

                this.footerMessage = footerMessage;
@@ -383,6 +395,8 @@ public class ChooseLockPattern extends SettingsActivity { 
            }



            final int headerMessage;

            final int messageForFingerprint;

            final int message;

            final LeftButtonMode leftMode;

            final RightButtonMode rightMode;

            final int footerMessage;
@@ -450,6 +464,7 @@ public class ChooseLockPattern extends SettingsActivity { 
        public void onViewCreated(View view, Bundle savedInstanceState) {

            super.onViewCreated(view, savedInstanceState);

            mHeaderText = (TextView) view.findViewById(R.id.headerText);

            mMessageText = view.findViewById(R.id.message);

            mLockPatternView = (LockPatternView) view.findViewById(R.id.lockPattern);

            mLockPatternView.setOnPatternListener(mChooseNewLockPatternListener);

            mLockPatternView.setTactileFeedbackEnabled(
@@ -634,6 +649,12 @@ public class ChooseLockPattern extends SettingsActivity { 
            } else {

                mHeaderText.setText(stage.headerMessage);

            }

            int message = mForFingerprint ? stage.messageForFingerprint : stage.message;

            if (message == ID_EMPTY_MESSAGE) {

                mMessageText.setText("");

            } else {

                mMessageText.setText(message);

            }

            if (stage.footerMessage == ID_EMPTY_MESSAGE) {

                mFooterText.setText("");

            } else {