Merge "Use on-screen text in a11y text changed event" into pi-dev

2018-03-28 02:06:27 +00:00
parent 3844e1d83c 092f754397
commit ebd87bf395
1 changed files with 2 additions and 3 deletions
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -12474,9 +12474,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
                        + " before=" + before + " after=" + after + ": " + buffer);
            }

-            if (AccessibilityManager.getInstance(mContext).isEnabled()
-                    && !isPasswordInputType(getInputType()) && !hasPasswordTransformationMethod()) {
-                mBeforeText = buffer.toString();
+            if (AccessibilityManager.getInstance(mContext).isEnabled() && (mTransformed != null)) {
+                mBeforeText = mTransformed.toString();
            }

            TextView.this.sendBeforeTextChanged(buffer, start, before, after);