PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename buttons in lock screen setup" into oc-dr1-dev

Browse Source 
am: fbfca43e6e

Change-Id: Ia7de9aba909a00bb2bf9acd01d897fcedcdfb4c2
This commit is contained in:
Maurice Lam
2017-06-27 01:17:25 +00:00
committed by android-build-merger
parent 467f39d243 fbfca43e6e
commit 57e61ba4f3
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/choose_lock_password_footer.xml
View File

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

5
src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java
View File

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

4
src/com/android/settings/password/ChooseLockPassword.java
View File

@@ -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) {

4
src/com/android/settings/password/ChooseLockPattern.java
View File

@@ -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);