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

Commit e4d98cd1 authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merge "Ignore hidden views when computing exclusion rects" into qt-qpr1-dev am: b5b3a581 

am: 6ff8b5d1

Change-Id: I30cfe658327833232871dcd0a3bb895d5453026f
parents 94012036 6ff8b5d1

core/java/android/view/GestureExclusionTracker.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ class GestureExclusionTracker { 
        while (i.hasNext()) {

        while (i.hasNext()) {

            final GestureExclusionViewInfo info = i.next();

            final GestureExclusionViewInfo info = i.next();

            final View v = info.getView();

            final View v = info.getView();

            if (v == null || !v.isAttachedToWindow()) {

            if (v == null || !v.isAttachedToWindow() || !v.isShown()) {

                mGestureExclusionViewsChanged = true;

                mGestureExclusionViewsChanged = true;

                i.remove();

                i.remove();

                continue;

                continue;
@@ -122,7 +122,8 @@ class GestureExclusionTracker { 




        public int update() {

        public int update() {

            final View excludedView = getView();

            final View excludedView = getView();

            if (excludedView == null || !excludedView.isAttachedToWindow()) return GONE;

            if (excludedView == null || !excludedView.isAttachedToWindow()

                    || !excludedView.isShown()) return GONE;

            final List<Rect> localRects = excludedView.getSystemGestureExclusionRects();

            final List<Rect> localRects = excludedView.getSystemGestureExclusionRects();

            final List<Rect> newRects = new ArrayList<>(localRects.size());

            final List<Rect> newRects = new ArrayList<>(localRects.size());

            for (Rect src : localRects) {

            for (Rect src : localRects) {

core/java/android/view/View.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -14403,6 +14403,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
        }

        }











        notifyAppearedOrDisappearedForContentCaptureIfNeeded(isVisible);




        notifyAppearedOrDisappearedForContentCaptureIfNeeded(isVisible);










        updateSystemGestureExclusionRects();








    }




    }


















    /**




    /**