Skip to content

Commit c87f198

Browse files
Mike CleronAndroid (Google) Code Review
authored andcommitted
Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev
2 parents 6c64208 + 72bba58 commit c87f198

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

core/java/android/widget/TextView.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8780,8 +8780,8 @@ public void beforeTextChanged(CharSequence buffer, int start,
87808780
+ " before=" + before + " after=" + after + ": " + buffer);
87818781

87828782
if (AccessibilityManager.getInstance(mContext).isEnabled()
8783-
&& !isPasswordInputType(getInputType())
8784-
&& !hasPasswordTransformationMethod()) {
8783+
&& ((!isPasswordInputType(getInputType()) && !hasPasswordTransformationMethod())
8784+
|| shouldSpeakPasswordsForAccessibility())) {
87858785
mBeforeText = buffer.toString();
87868786
}
87878787

0 commit comments

Comments
 (0)