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

Commit c57b19d8 authored by Maurice Lam's avatar Maurice Lam
Browse files

Rename buttons in lock screen setup 

- "Continue" in choose lock flows are renamed to "Next"
- "Done" in fingerprint enroll finish screen is renamed to "Next"
  during setup flow.

Test: Manual
Bug: 62839648
Change-Id: I3ea77b759b654d7c1da1f7b545781c9dfd74caa3
parent e2859904

res/layout/choose_lock_password_footer.xml

+1 −1
Original line number Diff line number Diff line
@@ -38,6 +38,6 @@ 
        style="@style/SuwGlifButton.Primary"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

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

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



</LinearLayout>

src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java

+3 −2
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ package com.android.settings.fingerprint; 
import android.content.Intent;

import android.content.res.Resources;

import android.os.UserHandle;

import android.view.View;

import android.widget.TextView;

import android.widget.Button;



import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.R;
@@ -49,6 +48,8 @@ public class SetupFingerprintEnrollFinish extends FingerprintEnrollFinish { 
    @Override

    protected void initViews() {

        super.initViews();

        Button nextButton = findViewById(R.id.next_button);

        nextButton.setText(R.string.next_label);

    }



    @Override

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

+2 −2
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ public class ChooseLockPassword extends SettingsActivity { 
                    R.string.lockpassword_choose_your_password_header_for_fingerprint,

                    R.string.lockpassword_choose_your_pin_header,

                    R.string.lockpassword_choose_your_pin_header_for_fingerprint,

                    R.string.lockpassword_continue_label),

                    R.string.next_label),



            NeedToConfirm(

                    R.string.lockpassword_confirm_your_password_header,
@@ -255,7 +255,7 @@ public class ChooseLockPassword extends SettingsActivity { 
                    R.string.lockpassword_confirm_passwords_dont_match,

                    R.string.lockpassword_confirm_pins_dont_match,

                    R.string.lockpassword_confirm_pins_dont_match,

                    R.string.lockpassword_continue_label);

                    R.string.next_label);



            Stage(int hintInAlpha, int hintInAlphaForFingerprint,

                    int hintInNumeric, int hintInNumericForFingerprint, int nextButtonText) {

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

+2 −2
Original line number Diff line number Diff line
@@ -305,8 +305,8 @@ public class ChooseLockPattern extends SettingsActivity { 
         * The states of the right button.

         */

        enum RightButtonMode {

            Continue(R.string.lockpattern_continue_button_text, true),

            ContinueDisabled(R.string.lockpattern_continue_button_text, false),

            Continue(R.string.next_label, true),

            ContinueDisabled(R.string.next_label, false),

            Confirm(R.string.lockpattern_confirm_button_text, true),

            ConfirmDisabled(R.string.lockpattern_confirm_button_text, false),

            Ok(android.R.string.ok, true);