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

Commit 6ff8b5d1 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

Change-Id: Ibd8f15a0fbb380efa8989a09ecdcf1baa66fb201
parents 0c09a408 b5b3a581

core/java/android/view/GestureExclusionTracker.java

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

            final GestureExclusionViewInfo info = i.next();

            final View v = info.getView();

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

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

                mGestureExclusionViewsChanged = true;

                i.remove();

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


        public int update() {

            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> newRects = new ArrayList<>(localRects.size());

            for (Rect src : localRects) {

core/java/android/view/View.java

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















        notifyAppearedOrDisappearedForContentCaptureIfNeeded(isVisible);













        updateSystemGestureExclusionRects();















    }





























    /**