summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2019-09-17 14:08:14 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-17 14:08:14 -0700
commit05a91477e546ee0f6eab447763d86938f656da08 (patch)
tree075c1a0ce44c74ab4c0590838d303acb392e15ba /core/java
parent4e4cded6600d5bb0dfe118baa3688c5c627631f7 (diff)
parent2f8f814501854dbee561fa937403a4ef9ebefcec (diff)
Merge "Skip updating exclusion rects unless one is set" into qt-qpr1-dev am: 4b15467f5f
am: 2f8f814501 Change-Id: If3d72a9866f1aff44326db653e4f1fd670275366
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/view/View.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index bdfb3e318b3b..cfb6a79a674c 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -14466,8 +14466,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
}
notifyAppearedOrDisappearedForContentCaptureIfNeeded(isVisible);
- if (isVisible != oldVisible) {
- updateSystemGestureExclusionRects();
+ if (!getSystemGestureExclusionRects().isEmpty() && isVisible != oldVisible) {
+ postUpdateSystemGestureExclusionRects();
}
}