Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: b5b3a58173

Change-Id: Ibd8f15a0fbb380efa8989a09ecdcf1baa66fb201
This commit is contained in:
Winson Chung
2019-08-27 15:38:28 -07:00
committed by android-build-merger
parent 0c09a40896 b5b3a58173
commit 6ff8b5d1fe
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/view/GestureExclusionTracker.java
View File

@@ -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) {

1
core/java/android/view/View.java
View File

@@ -14423,6 +14423,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
}
notifyAppearedOrDisappearedForContentCaptureIfNeeded(isVisible);
updateSystemGestureExclusionRects();
}
/**