diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2012-05-17 20:56:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-17 20:56:37 -0700 |
| commit | 72e15ceb85ecbe066c2ba33ca7e086dc511a8d23 (patch) | |
| tree | 24af225577e1ad1110d55b82744e6e4d4c61e4e4 /core/java/android/widget/TextView.java | |
| parent | d904c1c924f061f1ca0d5d36fe72ba29208167d6 (diff) | |
| parent | cefd97c8546d6dca184e8ac9589ab2ff1b795c06 (diff) | |
am cefd97c8: am e54c5f13: Merge "Exposing some accessiblity actions only for enabled views." into jb-dev
* commit 'cefd97c8546d6dca184e8ac9589ab2ff1b795c06':
Exposing some accessiblity actions only for enabled views.
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 4192d283751c..7d69bbcdad2f 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -7728,8 +7728,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener info.setText(getTextForAccessibility()); } - if (TextUtils.isEmpty(getContentDescription()) - && !TextUtils.isEmpty(mText)) { + if (TextUtils.isEmpty(getContentDescription()) && !TextUtils.isEmpty(mText)) { info.addAction(AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY); info.addAction(AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY); info.setMovementGranularities(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_CHARACTER |