summaryrefslogtreecommitdiffstats
path: root/core/java/com
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2015-02-03 18:13:40 -0800
committerDianne Hackborn <hackbod@google.com>2015-02-06 10:42:44 -0800
commita7bb6fbeab933326d58aa806d8194b7b13239d34 (patch)
treef56d4455b6eec18420a982573b800fb0b6220ce1 /core/java/com
parentb989c5561ea10e623d73e7bb89b37ac38ccdd908 (diff)
downloadframeworks_base-a7bb6fbeab933326d58aa806d8194b7b13239d34.zip
frameworks_base-a7bb6fbeab933326d58aa806d8194b7b13239d34.tar.gz
frameworks_base-a7bb6fbeab933326d58aa806d8194b7b13239d34.tar.bz2
First quick implementation of auto assist data.
Introduce new AssistData class that contains all data the framework automatically generates for assist. Currently populated with a very simple tree structure representing the app's view hierarchy. Reworked how we populate the class name for accessibility info, so this is provided through a new method call on View that subclasses can override. This method is also used to populate the class name in AssistData. Change-Id: Ibd0acdc8354727d4291473283b5e4b70894905dc
Diffstat (limited to 'core/java/com')
-rw-r--r--core/java/com/android/internal/widget/ResolverDrawerLayout.java6
-rw-r--r--core/java/com/android/internal/widget/ScrollingTabContainerView.java12
2 files changed, 4 insertions, 14 deletions
diff --git a/core/java/com/android/internal/widget/ResolverDrawerLayout.java b/core/java/com/android/internal/widget/ResolverDrawerLayout.java
index 4e48454..01e835b 100644
--- a/core/java/com/android/internal/widget/ResolverDrawerLayout.java
+++ b/core/java/com/android/internal/widget/ResolverDrawerLayout.java
@@ -593,15 +593,13 @@ public class ResolverDrawerLayout extends ViewGroup {
}
@Override
- public void onInitializeAccessibilityEvent(AccessibilityEvent event) {
- super.onInitializeAccessibilityEvent(event);
- event.setClassName(ResolverDrawerLayout.class.getName());
+ public CharSequence getAccessibilityClassName() {
+ return ResolverDrawerLayout.class.getName();
}
@Override
public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
super.onInitializeAccessibilityNodeInfo(info);
- info.setClassName(ResolverDrawerLayout.class.getName());
if (isEnabled()) {
if (mCollapseOffset != 0) {
info.addAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD);
diff --git a/core/java/com/android/internal/widget/ScrollingTabContainerView.java b/core/java/com/android/internal/widget/ScrollingTabContainerView.java
index a306697..825fcad 100644
--- a/core/java/com/android/internal/widget/ScrollingTabContainerView.java
+++ b/core/java/com/android/internal/widget/ScrollingTabContainerView.java
@@ -393,17 +393,9 @@ public class ScrollingTabContainerView extends HorizontalScrollView
}
@Override
- public void onInitializeAccessibilityEventInternal(AccessibilityEvent event) {
- super.onInitializeAccessibilityEventInternal(event);
+ public CharSequence getAccessibilityClassName() {
// This view masquerades as an action bar tab.
- event.setClassName(ActionBar.Tab.class.getName());
- }
-
- @Override
- public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) {
- super.onInitializeAccessibilityNodeInfoInternal(info);
- // This view masquerades as an action bar tab.
- info.setClassName(ActionBar.Tab.class.getName());
+ return ActionBar.Tab.class.getName();
}
@Override