PawletOS/app_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
res/layout/choose_lock_password.xml
View File

@@ -34,7 +34,7 @@
android:orientation="vertical">
<TextView
android:id="@+id/message"
android:id="@+id/sud_layout_description"
style="@style/SudDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
res/layout/choose_lock_pattern_common.xml
View File

@@ -70,7 +70,7 @@
android:paddingRight="0dp">
<TextView
android:id="@+id/message"
android:id="@+id/sud_layout_description"
style="@style/SudDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
res/layout/confirm_lock_password_normal.xml
View File

@@ -28,7 +28,7 @@
android:layout_height="match_parent">
<TextView
android:id="@+id/detailsText"
android:id="@+id/sud_layout_description"
style="@style/SudDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
res/layout/confirm_lock_pattern_normal_base.xml
View File

@@ -48,7 +48,7 @@
<TextView
style="@style/SudDescription.Glif"
android:id="@+id/detailsText"
android:id="@+id/sud_layout_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginSides"

2
res/layout/encryption_interstitial.xml
View File

@@ -30,7 +30,7 @@
android:orientation="vertical">
<TextView
android:id="@+id/encryption_message"
android:id="@+id/sud_layout_description"
style="@style/SudDescription.Glif"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />

2
res/layout/face_enroll_introduction.xml
View File

@@ -33,7 +33,7 @@
android:orientation="vertical">
<com.google.android.setupdesign.view.RichTextView
android:id="@+id/description_text"
android:id="@+id/sud_layout_description"
style="@style/SudDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
res/layout/fingerprint_enroll_enrolling_base.xml
View File

@@ -38,7 +38,7 @@
<TextView
style="@style/SudDescription.Glif"
android:id="@+id/start_message"
android:id="@+id/sud_layout_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minLines="3"

1
res/layout/fingerprint_enroll_find_sensor_base.xml
View File

@@ -39,6 +39,7 @@
<TextView
style="@style/SudDescription.Glif"
android:id="@+id/sud_layout_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/sud_description_glif_margin_top"

2
res/layout/fingerprint_enroll_finish_base.xml
View File

@@ -31,7 +31,7 @@
android:clipChildren="false">
<TextView
android:id="@+id/message"
android:id="@+id/sud_layout_description"
style="@style/SudDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
res/layout/fingerprint_enroll_introduction.xml
View File

@@ -31,7 +31,7 @@
android:orientation="vertical">
<com.google.android.setupdesign.view.RichTextView
android:id="@+id/description_text"
android:id="@+id/sud_layout_description"
style="@style/SudDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"

1
res/layout/master_clear.xml
View File

@@ -41,6 +41,7 @@
<TextView
style="@style/TextAppearance.SudGlifItemSummary"
android:id="@+id/sud_layout_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/master_clear_desc"/>

2
res/layout/master_clear_confirm.xml
View File

@@ -31,7 +31,7 @@
android:orientation="vertical">
<TextView
android:id="@+id/master_clear_confirm"
android:id="@+id/sud_layout_description"
style="@style/SudItemTitle.GlifDescription"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

2
res/layout/redaction_interstitial.xml
View File

@@ -33,7 +33,7 @@
android:orientation="vertical">
<TextView
android:id="@+id/message"
android:id="@+id/sud_layout_description"
style="@style/SudDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
src/com/android/settings/EncryptionInterstitial.java
View File

@@ -141,7 +141,7 @@ public class EncryptionInterstitial extends SettingsActivity {
R.string.encryption_interstitial_message_password;
break;
}
TextView message = (TextView) getActivity().findViewById(R.id.encryption_message);
TextView message = (TextView) getActivity().findViewById(R.id.sud_layout_description);
message.setText(msgId);
setRequirePasswordState(getActivity().getIntent().getBooleanExtra(

4
src/com/android/settings/MasterClearConfirm.java
View File

@@ -207,7 +207,7 @@ public class MasterClearConfirm extends InstrumentedFragment {
private void setAccessibilityTitle() {
CharSequence currentTitle = getActivity().getTitle();
TextView confirmationMessage = mContentView.findViewById(R.id.master_clear_confirm);
TextView confirmationMessage = mContentView.findViewById(R.id.sud_layout_description);
if (confirmationMessage != null) {
String accessibleText = new StringBuilder(currentTitle).append(",").append(
confirmationMessage.getText()).toString();
@@ -218,7 +218,7 @@ public class MasterClearConfirm extends InstrumentedFragment {
@VisibleForTesting
void setSubtitle() {
if (mEraseEsims) {
((TextView) mContentView.findViewById(R.id.master_clear_confirm))
((TextView) mContentView.findViewById(R.id.sud_layout_description))
.setText(R.string.master_clear_final_desc_esim);
}
}

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

2
src/com/android/settings/notification/RedactionInterstitial.java
View File

@@ -123,7 +123,7 @@ public class RedactionInterstitial extends SettingsActivity {
mUserId = Utils.getUserIdFromBundle(
getContext(), getActivity().getIntent().getExtras());
if (UserManager.get(getContext()).isManagedProfile(mUserId)) {
((TextView) view.findViewById(R.id.message))
((TextView) view.findViewById(R.id.sud_layout_description))
.setText(R.string.lock_screen_notifications_interstitial_message_profile);
mShowAllButton.setText(R.string.lock_screen_notifications_summary_show_profile);
mRedactSensitiveButton

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

@@ -443,7 +443,7 @@ public class ChooseLockPassword extends SettingsActivity {
mSkipOrClearButton = mixin.getSecondaryButton();
mNextButton = mixin.getPrimaryButton();
mMessage = view.findViewById(R.id.message);
mMessage = view.findViewById(R.id.sud_layout_description);
if (mForFingerprint) {
mLayout.setIcon(getActivity().getDrawable(R.drawable.ic_fingerprint_header));
} else if (mForFace) {

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

@@ -520,7 +520,7 @@ public class ChooseLockPattern extends SettingsActivity {
mTitleText = view.findViewById(R.id.suc_layout_title);
mHeaderText = (TextView) view.findViewById(R.id.headerText);
mDefaultHeaderColorList = mHeaderText.getTextColors();
mMessageText = view.findViewById(R.id.message);
mMessageText = view.findViewById(R.id.sud_layout_description);
mLockPatternView = (LockPatternView) view.findViewById(R.id.lockPattern);
mLockPatternView.setOnPatternListener(mChooseNewLockPatternListener);
mLockPatternView.setTactileFeedbackEnabled(

2
src/com/android/settings/password/ConfirmLockPassword.java
View File

@@ -137,7 +137,7 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
if (mHeaderTextView == null) {
mHeaderTextView = view.findViewById(R.id.suc_layout_title);
}
mDetailsTextView = (TextView) view.findViewById(R.id.detailsText);
mDetailsTextView = (TextView) view.findViewById(R.id.sud_layout_description);
mErrorTextView = (TextView) view.findViewById(R.id.errorText);
mIsAlpha = DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC == storedQuality
|| DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC == storedQuality

2
src/com/android/settings/password/ConfirmLockPattern.java
View File

@@ -116,7 +116,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
false);
mHeaderTextView = (TextView) view.findViewById(R.id.headerText);
mLockPatternView = (LockPatternView) view.findViewById(R.id.lockPattern);
mDetailsTextView = (TextView) view.findViewById(R.id.detailsText);
mDetailsTextView = (TextView) view.findViewById(R.id.sud_layout_description);
mErrorTextView = (TextView) view.findViewById(R.id.errorText);
mLeftSpacerLandscape = view.findViewById(R.id.leftSpacer);
mRightSpacerLandscape = view.findViewById(R.id.rightSpacer);

4
tests/robotests/src/com/android/settings/MasterClearConfirmTest.java
View File

@@ -47,7 +47,7 @@ public class MasterClearConfirmTest {
masterClearConfirm.setSubtitle();
assertThat(((TextView) masterClearConfirm.mContentView
.findViewById(R.id.master_clear_confirm)).getText())
.findViewById(R.id.sud_layout_description)).getText())
.isEqualTo(mActivity.getString(R.string.master_clear_final_desc_esim));
}
@@ -61,7 +61,7 @@ public class MasterClearConfirmTest {
masterClearConfirm.setSubtitle();
assertThat(((TextView) masterClearConfirm.mContentView
.findViewById(R.id.master_clear_confirm)).getText())
.findViewById(R.id.sud_layout_description)).getText())
.isEqualTo(mActivity.getString(R.string.master_clear_final_desc));
}
}