From 4acd0ecc7b2351cadafc02986f8165f811e00cb1 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Wed, 12 Nov 2014 11:05:29 -0800
Subject: [PATCH] Account for window bounds in accessibility view click point
 computation

BUG: 18177402
Change-Id: If591d1b9e5a8a7c4cade3ef4f3ec5e42d623b53c
---
 core/java/android/view/View.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 1d09696c517f3..0d1a1169d70ab 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -5901,6 +5901,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
                 region.op(interactiveRegion, Region.Op.INTERSECT);
             }
 
+            // Take into account the window bounds.
+            final View root = getRootView();
+            if (root != null) {
+                region.op(dx, dy, root.getWidth() + dx, root.getHeight() + dy, Region.Op.INTERSECT);
+            }
+
             // If the view is completely covered, done.
             if (region.isEmpty()) {
                 return false;