Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbd5fe84 authored by Svetoslav's avatar Svetoslav Committed by Android Git Automerger
Browse files

am 64076958: am 72ab9b80: Merge "Respect custom view drawing order when... 

am 64076958: am 72ab9b80: Merge "Respect custom view drawing order when dispatching hover events." into jb-mr2-dev

* commit '64076958':
  Respect custom view drawing order when dispatching hover events.
parents 520c1036 64076958

core/java/android/view/ViewGroup.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -1474,10 +1474,13 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
            final float y = event.getY();

            final float y = event.getY();

            final int childrenCount = mChildrenCount;

            final int childrenCount = mChildrenCount;

            if (childrenCount != 0) {

            if (childrenCount != 0) {

                final boolean customChildOrder = isChildrenDrawingOrderEnabled();

                final View[] children = mChildren;

                final View[] children = mChildren;

                HoverTarget lastHoverTarget = null;

                HoverTarget lastHoverTarget = null;

                for (int i = childrenCount - 1; i >= 0; i--) {

                for (int i = childrenCount - 1; i >= 0; i--) {

                    final View child = children[i];

                    final int childIndex = customChildOrder

                            ? getChildDrawingOrder(childrenCount, i) : i;

                    final View child = children[childIndex];

                    if (!canViewReceivePointerEvents(child)

                    if (!canViewReceivePointerEvents(child)

                            || !isTransformedTouchPointInView(x, y, child, null)) {

                            || !isTransformedTouchPointInView(x, y, child, null)) {

                        continue;

                        continue;