diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2011-10-28 15:40:32 -0700 |
|---|---|---|
| committer | Svetoslav Ganov <svetoslavganov@google.com> | 2011-10-28 15:40:32 -0700 |
| commit | f79f476fd1e25d3d7bf77e890d064a503537e939 (patch) | |
| tree | cf6ca3a7996cefd94c0d0d30ae834f4d2e27b7a4 /core/java/android/view/ViewRootImpl.java | |
| parent | 5b9c79f27ee1bfc1ab70770b55dc10e24988a42a (diff) | |
| parent | c00d2ddcc343b7bcdce30925df90523bb7371f83 (diff) | |
| download | frameworks_base-f79f476fd1e25d3d7bf77e890d064a503537e939.zip frameworks_base-f79f476fd1e25d3d7bf77e890d064a503537e939.tar.gz frameworks_base-f79f476fd1e25d3d7bf77e890d064a503537e939.tar.bz2 | |
resolved conflicts for merge of c00d2ddc to master
Change-Id: I075cc5b5df2909152ee463f8a0c7534344b47c62
Diffstat (limited to 'core/java/android/view/ViewRootImpl.java')
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 4f9cd90..c31ae0e 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -4474,12 +4474,12 @@ public final class ViewRootImpl extends Handler implements ViewParent, * AccessibilityManagerService to the latter can interact with * the view hierarchy in this ViewAncestor. */ - final class AccessibilityInteractionConnection + static final class AccessibilityInteractionConnection extends IAccessibilityInteractionConnection.Stub { private final WeakReference<ViewRootImpl> mViewRootImpl; - AccessibilityInteractionConnection(ViewRootImpl viewAncestor) { - mViewRootImpl = new WeakReference<ViewRootImpl>(viewAncestor); + AccessibilityInteractionConnection(ViewRootImpl viewRootImpl) { + mViewRootImpl = new WeakReference<ViewRootImpl>(viewRootImpl); } public void findAccessibilityNodeInfoByAccessibilityId(long accessibilityNodeId, @@ -4487,7 +4487,7 @@ public final class ViewRootImpl extends Handler implements ViewParent, int interrogatingPid, long interrogatingTid) { ViewRootImpl viewRootImpl = mViewRootImpl.get(); if (viewRootImpl != null && viewRootImpl.mView != null) { - getAccessibilityInteractionController() + viewRootImpl.getAccessibilityInteractionController() .findAccessibilityNodeInfoByAccessibilityIdClientThread(accessibilityNodeId, interactionId, callback, interrogatingPid, interrogatingTid); } @@ -4498,7 +4498,7 @@ public final class ViewRootImpl extends Handler implements ViewParent, int interogatingPid, long interrogatingTid) { ViewRootImpl viewRootImpl = mViewRootImpl.get(); if (viewRootImpl != null && viewRootImpl.mView != null) { - getAccessibilityInteractionController() + viewRootImpl.getAccessibilityInteractionController() .performAccessibilityActionClientThread(accessibilityNodeId, action, interactionId, callback, interogatingPid, interrogatingTid); } @@ -4509,7 +4509,7 @@ public final class ViewRootImpl extends Handler implements ViewParent, int interrogatingPid, long interrogatingTid) { ViewRootImpl viewRootImpl = mViewRootImpl.get(); if (viewRootImpl != null && viewRootImpl.mView != null) { - getAccessibilityInteractionController() + viewRootImpl.getAccessibilityInteractionController() .findAccessibilityNodeInfoByViewIdClientThread(viewId, interactionId, callback, interrogatingPid, interrogatingTid); } @@ -4520,8 +4520,8 @@ public final class ViewRootImpl extends Handler implements ViewParent, int interrogatingPid, long interrogatingTid) { ViewRootImpl viewRootImpl = mViewRootImpl.get(); if (viewRootImpl != null && viewRootImpl.mView != null) { - getAccessibilityInteractionController() - .findAccessibilityNodeInfosByTextClientThread(text, accessibilityNodeId, + viewRootImpl.getAccessibilityInteractionController() + .findAccessibilityNodeInfosByViewTextClientThread(text, accessibilityNodeId, interactionId, callback, interrogatingPid, interrogatingTid); } } |