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

Merge "Fix disruptive announcement on PIN/Password set up" into main

Browse Source
This commit is contained in:
Treehugger Robot
2025-03-02 17:32:19 -08:00
committed by Android (Google) Code Review
parent 6e2bddaabd d334ebb556
commit 49f129ee11
3 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -13952,6 +13952,9 @@ Data usage charges may apply.</string>
<!-- Content description for setting password complete--> <!-- Content description for setting password complete-->
<string name="accessibility_setup_password_complete">Password is now set up</string> <string name="accessibility_setup_password_complete">Password is now set up</string>
<!-- Content description for setting PIN complete-->
<string name="accessibility_setup_pin_complete">PIN is now set up</string>
<!-- Authority of the content provider that support methods restartPhoneProcess and restartRild. Will be overlaid by OEM.--> <!-- Authority of the content provider that support methods restartPhoneProcess and restartRild. Will be overlaid by OEM.-->
<string name="reset_telephony_stack_content_provider_authority" translatable="false"></string> <string name="reset_telephony_stack_content_provider_authority" translatable="false"></string>

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

@@ -25,6 +25,7 @@ import static android.app.admin.DevicePolicyResources.Strings.Settings.REENTER_W
import static android.app.admin.DevicePolicyResources.Strings.Settings.SET_WORK_PROFILE_PASSWORD_HEADER; import static android.app.admin.DevicePolicyResources.Strings.Settings.SET_WORK_PROFILE_PASSWORD_HEADER;
import static android.app.admin.DevicePolicyResources.Strings.Settings.SET_WORK_PROFILE_PIN_HEADER; import static android.app.admin.DevicePolicyResources.Strings.Settings.SET_WORK_PROFILE_PIN_HEADER;
import static android.app.admin.DevicePolicyResources.UNDEFINED; import static android.app.admin.DevicePolicyResources.UNDEFINED;
import static android.view.View.ACCESSIBILITY_LIVE_REGION_ASSERTIVE;
import static android.view.View.ACCESSIBILITY_LIVE_REGION_POLITE; import static android.view.View.ACCESSIBILITY_LIVE_REGION_POLITE;
import static com.android.internal.widget.LockPatternUtils.CREDENTIAL_TYPE_NONE; import static com.android.internal.widget.LockPatternUtils.CREDENTIAL_TYPE_NONE;
@@ -70,6 +71,7 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.WindowManager; import android.view.WindowManager;
import android.view.accessibility.AccessibilityManager;
import android.view.inputmethod.EditorInfo; import android.view.inputmethod.EditorInfo;
import android.widget.CheckBox; import android.widget.CheckBox;
import android.widget.ImeAwareEditText; import android.widget.ImeAwareEditText;
@@ -1126,6 +1128,19 @@ public class ChooseLockPassword extends SettingsActivity {
mPasswordEntry.setText(""); mPasswordEntry.setText("");
final AccessibilityManager accessibilityManager =
(AccessibilityManager) getActivity().getSystemService(
Context.ACCESSIBILITY_SERVICE);
if (accessibilityManager.isEnabled()) {
if (mPasswordEntry != null) {
mPasswordEntry.setAccessibilityLiveRegion(ACCESSIBILITY_LIVE_REGION_ASSERTIVE);
mPasswordEntry.setStateDescription(
mIsAlphaMode ? getString(R.string.accessibility_setup_password_complete)
: getString(R.string.accessibility_setup_pin_complete));
}
}
if (!wasSecureBefore) { if (!wasSecureBefore) {
Intent intent = getRedactionInterstitialIntent(getActivity()); Intent intent = getRedactionInterstitialIntent(getActivity());
if (intent != null) { if (intent != null) {
@@ -1133,11 +1148,6 @@ public class ChooseLockPassword extends SettingsActivity {
} }
} }
if (mLayout != null) {
mLayout.announceForAccessibility(
getString(R.string.accessibility_setup_password_complete));
}
getActivity().finish(); getActivity().finish();
} }

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

@@ -743,10 +743,11 @@ public class ChooseLockPattern extends SettingsActivity {
// header text, footer text, visibility and // header text, footer text, visibility and
// enabled state all known from the stage // enabled state all known from the stage
if (stage == Stage.ChoiceTooShort) { if (stage == Stage.ChoiceTooShort) {
layout.setDescriptionText( final String desc = getResources().getString(
getResources().getString( stage.headerMessage,
stage.headerMessage, LockPatternUtils.MIN_LOCK_PATTERN_SIZE);
LockPatternUtils.MIN_LOCK_PATTERN_SIZE)); layout.setDescriptionText(desc);
layout.setContentDescription(desc);
} else { } else {
layout.setDescriptionText(stage.headerMessage); layout.setDescriptionText(stage.headerMessage);
} }
@@ -887,11 +888,6 @@ public class ChooseLockPattern extends SettingsActivity {
} }
} }
if (mSudContent != null) {
mSudContent.announceForAccessibility(
getString(R.string.accessibility_setup_password_complete));
}
getActivity().finish(); getActivity().finish();
} }