summaryrefslogtreecommitdiffstats
path: root/core/java/android/view/ViewGroup.java
diff options
context:
space:
mode:
authorSvet Ganov <svetoslavganov@google.com>2014-12-09 00:17:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-09 00:17:31 +0000
commitaad2ffe67af43fcfc8784b57c0fb9fe4687c9d69 (patch)
tree26562cb091a6986a0f6f2b12845128e763874d5c /core/java/android/view/ViewGroup.java
parent2dbd133c966a3b1acc51a9b645622667830c7e3e (diff)
parent7f980d7508cab2bc9c4f84e5ea15984e284dbbb7 (diff)
downloadframeworks_base-aad2ffe67af43fcfc8784b57c0fb9fe4687c9d69.zip
frameworks_base-aad2ffe67af43fcfc8784b57c0fb9fe4687c9d69.tar.gz
frameworks_base-aad2ffe67af43fcfc8784b57c0fb9fe4687c9d69.tar.bz2
am 7f980d75: am 381a4236: Merge "When accessibility on cannot click on a view covered by a HorizontalScrollView" into lmp-mr1-dev
* commit '7f980d7508cab2bc9c4f84e5ea15984e284dbbb7': When accessibility on cannot click on a view covered by a HorizontalScrollView
Diffstat (limited to 'core/java/android/view/ViewGroup.java')
-rw-r--r--core/java/android/view/ViewGroup.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index c53af25..277e445 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -883,8 +883,11 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
return true;
}
+ /**
+ * @hide
+ */
@Override
- void addClickableRectsForAccessibility(List<RectF> outRects) {
+ public void addClickableRectsForAccessibility(List<RectF> outRects) {
int sizeBefore = outRects.size();
super.addClickableRectsForAccessibility(outRects);