Merge "Fix tooltip handling for invisible and overlapping views"

2017-01-18 20:30:15 +00:00
parent b61c00e2bf 943cf0eb78
commit 2582b80ae3
1 changed files with 6 additions and 5 deletions
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -2091,11 +2091,12 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
                                getAndVerifyPreorderedIndex(childrenCount, i, customOrder);
                        final View child =
                                getAndVerifyPreorderedView(preorderedList, children, childIndex);
-                        final PointF point = getLocalPoint();
-                        if (isTransformedTouchPointInView(x, y, child, point)) {
-                            if (dispatchTooltipHoverEvent(event, child)) {
-                                newTarget = child;
-                            }
+                        if (!canViewReceivePointerEvents(child)
+                                || !isTransformedTouchPointInView(x, y, child, null)) {
+                            continue;
+                        }
+                        if (dispatchTooltipHoverEvent(event, child)) {
+                            newTarget = child;
                            break;
                        }
                    }