summaryrefslogtreecommitdiff
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2012-05-16 18:45:31 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-16 18:45:31 -0700
commitcefd97c8546d6dca184e8ac9589ab2ff1b795c06 (patch)
treee29e8731059a4f5cbd92b93bbcbb582653916147 /core/java/android/widget/TextView.java
parent040b93110cc1183d646ad148993bb1c9e6ceb71c (diff)
parente54c5f13652166c5896ccfa55f047301a6c8b876 (diff)
am e54c5f13: Merge "Exposing some accessiblity actions only for enabled views." into jb-dev
* commit 'e54c5f13652166c5896ccfa55f047301a6c8b876': 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.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index fc56e116ac08..112881cb19b7 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -7739,8 +7739,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