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

Merge "Add content description for password&pin credential view." into main

Browse Source
This commit is contained in:
Treehugger Robot
2025-02-28 15:42:39 -08:00
committed by Android (Google) Code Review
parent c5777c85f6 1cd98d4993
commit 34d1075280
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -585,10 +585,10 @@ public class ChooseLockPassword extends SettingsActivity {
: (InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD));
if (mIsAlphaMode) {
mPasswordEntry.setContentDescription(
getString(R.string.unlock_set_unlock_password_title));
getString(R.string.unlock_accessibility_password));
} else {
mPasswordEntry.setContentDescription(
getString(R.string.unlock_set_unlock_pin_title));
getString(R.string.unlock_accessibility_pin_area));
}
// Can't set via XML since setInputType resets the fontFamily to null
mPasswordEntry.setTypeface(Typeface.create(

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

@@ -66,7 +66,6 @@ import com.android.internal.widget.LockscreenCredential;
import com.android.internal.widget.TextViewInputDisabler;
import com.android.settings.R;
import com.android.settings.SetupRedactionInterstitial;
import com.android.settings.SetupWizardUtils;
import com.android.settings.Utils;
import com.android.settingslib.animation.AppearAnimationUtils;
import com.android.settingslib.animation.DisappearAnimationUtils;
@@ -211,12 +210,12 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
if (mIsAlpha) {
mPasswordEntry.setInputType(currentType);
mPasswordEntry.setContentDescription(
getContext().getString(R.string.unlock_set_unlock_password_title));
getContext().getString(R.string.unlock_accessibility_password));
} else {
mPasswordEntry.setInputType(
InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD);
mPasswordEntry.setContentDescription(
getContext().getString(R.string.unlock_set_unlock_pin_title));
getContext().getString(R.string.unlock_accessibility_pin_area));
}
// Can't set via XML since setInputType resets the fontFamily to null
mPasswordEntry.setTypeface(Typeface.create(