Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Set suw description textview to fixed id" into qt-dev

Browse Source
This commit is contained in:
Pasty Chang
2019-04-14 03:53:16 +00:00
committed by Android (Google) Code Review
parent c4083cecd7 fa68ec4f56
commit ee35c1bddf
24 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
View File

@@ -276,7 +276,7 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
protected void initViews() {
super.initViews();
TextView description = (TextView) findViewById(R.id.description_text);
TextView description = (TextView) findViewById(R.id.sud_layout_description);
if (mBiometricUnlockDisabledByAdmin) {
description.setText(getDescriptionResDisabledByAdmin());
}

2
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
View File

@@ -131,7 +131,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
super.onCreate(savedInstanceState);
setContentView(R.layout.fingerprint_enroll_enrolling);
setHeaderText(R.string.security_settings_fingerprint_enroll_repeat_title);
mStartMessage = (TextView) findViewById(R.id.start_message);
mStartMessage = (TextView) findViewById(R.id.sud_layout_description);
mRepeatMessage = (TextView) findViewById(R.id.repeat_message);
mErrorText = (TextView) findViewById(R.id.error_text);
mProgressBar = (ProgressBar) findViewById(R.id.fingerprint_progress_bar);

2
src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java
View File

@@ -89,7 +89,7 @@ public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntrodu
protected void initViews() {
super.initViews();
TextView description = (TextView) findViewById(R.id.description_text);
TextView description = (TextView) findViewById(R.id.sud_layout_description);
description.setText(
R.string.security_settings_fingerprint_enroll_introduction_message_setup);