Index: content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java |
diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java |
index 7383829077b5ad3f2eba47c19311cac1a52f9da0..23e0ca37bcc9d00beefbc2d83aca147beb5a5719 100644 |
--- a/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java |
+++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java |
@@ -57,7 +57,7 @@ public class BrowserAccessibilityManager { |
protected static final int ACTION_SCROLL_RIGHT = 0x0102003b; |
private final AccessibilityNodeProvider mAccessibilityNodeProvider; |
- private ContentViewCore mContentViewCore; |
+ protected ContentViewCore mContentViewCore; |
private final AccessibilityManager mAccessibilityManager; |
private final RenderCoordinates mRenderCoordinates; |
private long mNativeObj; |
@@ -955,20 +955,23 @@ public class BrowserAccessibilityManager { |
@SuppressLint("NewApi") |
@CalledByNative |
- private void setAccessibilityNodeInfoText( |
- AccessibilityNodeInfo node, String text, boolean annotateAsLink, |
- boolean isEditableText) { |
- CharSequence charSequence = text; |
+ private void setAccessibilityNodeInfoText(AccessibilityNodeInfo node, String text, |
+ boolean annotateAsLink, boolean isEditableText, String language) { |
+ CharSequence computedText = computeText(text, isEditableText, language); |
+ if (isEditableText) { |
+ node.setText(computedText); |
+ } else { |
+ node.setContentDescription(computedText); |
+ } |
+ } |
+ |
+ protected CharSequence computeText(String text, boolean annotateAsLink, String language) { |
if (annotateAsLink) { |
SpannableString spannable = new SpannableString(text); |
spannable.setSpan(new URLSpan(""), 0, spannable.length(), 0); |
- charSequence = spannable; |
- } |
- if (isEditableText) { |
- node.setText(charSequence); |
- } else { |
- node.setContentDescription(charSequence); |
+ return spannable; |
} |
+ return text; |
} |
@CalledByNative |