summaryrefslogtreecommitdiffstats
path: root/core/java/android/view/ViewRootImpl.java
diff options
context:
space:
mode:
authorSvetoslav <svetoslavganov@google.com>2015-02-03 07:27:33 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-02-03 07:27:33 +0000
commitf8acd7a961f3a36712519d0f925f86f3da8d0b7c (patch)
tree6fb37306627add6033dd0c75049a8b94d0eeac80 /core/java/android/view/ViewRootImpl.java
parent712e38eaba012904a515dc84d1edda4dab563dcc (diff)
parentb6b526eaafdcc39e9d55a82f61f1e03c4a3487c3 (diff)
downloadframeworks_base-f8acd7a961f3a36712519d0f925f86f3da8d0b7c.zip
frameworks_base-f8acd7a961f3a36712519d0f925f86f3da8d0b7c.tar.gz
frameworks_base-f8acd7a961f3a36712519d0f925f86f3da8d0b7c.tar.bz2
Fix broken activation of the selected view in accessibility mode. automerge: ded133c
automerge: b6b526e * commit 'b6b526eaafdcc39e9d55a82f61f1e03c4a3487c3': Fix broken activation of the selected view in accessibility mode.
Diffstat (limited to 'core/java/android/view/ViewRootImpl.java')
-rw-r--r--core/java/android/view/ViewRootImpl.java22
1 files changed, 1 insertions, 21 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 87d9a58..e4d82b1 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -2703,7 +2703,7 @@ public final class ViewRootImpl implements ViewParent,
final AccessibilityNodeProvider provider = host.getAccessibilityNodeProvider();
if (provider == null) {
- host.getBoundsOnScreen(bounds);
+ host.getBoundsOnScreen(bounds, true);
} else if (mAccessibilityFocusedVirtualView != null) {
mAccessibilityFocusedVirtualView.getBoundsInScreen(bounds);
} else {
@@ -6835,26 +6835,6 @@ public final class ViewRootImpl implements ViewParent,
}
@Override
- public void computeClickPointInScreen(long accessibilityNodeId, Region interactiveRegion,
- int interactionId, IAccessibilityInteractionConnectionCallback callback,
- int interrogatingPid, long interrogatingTid, MagnificationSpec spec) {
- ViewRootImpl viewRootImpl = mViewRootImpl.get();
- if (viewRootImpl != null && viewRootImpl.mView != null) {
- viewRootImpl.getAccessibilityInteractionController()
- .computeClickPointInScreenClientThread(accessibilityNodeId,
- interactiveRegion, interactionId, callback, interrogatingPid,
- interrogatingTid, spec);
- } else {
- // We cannot make the call and notify the caller so it does not wait.
- try {
- callback.setComputeClickPointInScreenActionResult(null, interactionId);
- } catch (RemoteException re) {
- /* best effort - ignore */
- }
- }
- }
-
- @Override
public void findAccessibilityNodeInfosByViewId(long accessibilityNodeId,
String viewId, Region interactiveRegion, int interactionId,
IAccessibilityInteractionConnectionCallback callback, int flags,