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

am 012b4eae: am d8bc6677: Merge "Optimize text rendering in accessibility mode." into lmp-mr1-dev

Browse Source 
* commit '012b4eae10216648b2cff082e2c7809a1b0489a7':
  Optimize text rendering in accessibility mode.
This commit is contained in:
Svet Ganov
2014-10-23 15:58:43 +00:00
committed by Android Git Automerger
parent d439b034cb 012b4eae10
commit ae23078b23
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/widget/TextView.java
View File

@@ -8517,6 +8517,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
} return false;
case AccessibilityNodeInfo.ACTION_SET_SELECTION: {
if (isFocused() && canSelectText()) {
ensureIterableTextForAccessibilitySelectable();
CharSequence text = getIterableTextForAccessibility();
if (text == null) {
return false;
@@ -8542,6 +8543,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
}
}
} return false;
case AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY:
case AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY: {
ensureIterableTextForAccessibilitySelectable();
return super.performAccessibilityAction(action, arguments);
}
default: {
return super.performAccessibilityAction(action, arguments);
}
@@ -9031,10 +9037,13 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
*/
@Override
public CharSequence getIterableTextForAccessibility() {
return mText;
}
private void ensureIterableTextForAccessibilitySelectable() {
if (!(mText instanceof Spannable)) {
setText(mText, BufferType.SPANNABLE);
}
return mText;
}
/**