summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorMaxim Bogatov <maximbogatov@google.com>2015-06-16 22:48:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-16 22:48:59 +0000
commite6ba94ce022a60b5225ee54cf2cc710633441d87 (patch)
tree2a3b4d5c4cb368b4291f00d6819dd330a46317d5 /core/java
parent15ce33873e2ca774a1fca666a05cc8ed79f327d7 (diff)
parentf399af3e5f6b1ab30e40f1c4aac69e38459df4b9 (diff)
downloadframeworks_base-e6ba94ce022a60b5225ee54cf2cc710633441d87.zip
frameworks_base-e6ba94ce022a60b5225ee54cf2cc710633441d87.tar.gz
frameworks_base-e6ba94ce022a60b5225ee54cf2cc710633441d87.tar.bz2
Merge "fix CTS: AccessibilityEndToEndTest failing" into mnc-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/view/ViewGroup.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index 89743e5..73cfd8c 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -2939,11 +2939,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
}
}
- /** @hide */
@Override
- public void onInitializeAccessibilityEventInternal(AccessibilityEvent event) {
- super.onInitializeAccessibilityEventInternal(event);
- event.setClassName(ViewGroup.class.getName());
+ public CharSequence getAccessibilityClassName() {
+ return ViewGroup.class.getName();
}
@Override