Merge "Fine tune performance for notifyContentCapture()" into rvc-dev am: 2a7091d896 am: 3051a0a8d9 am: f5b0460ad5 am: 9a23b05a65

Change-Id: Ib835855f089259692839c7b5e2c04f7383b95e27

1 files changed, 8 insertions, 6 deletions

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index b1dded0eca62..89a55eb6c23d 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -14721,17 +14721,19 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
                 }
             }
         }
-        if (isAccessibilityPane()) {
-            if (isVisible != oldVisible) {
+
+        if (isVisible != oldVisible) {
+            if (isAccessibilityPane()) {
                 notifyViewAccessibilityStateChangedIfNeeded(isVisible
                         ? AccessibilityEvent.CONTENT_CHANGE_TYPE_PANE_APPEARED
                         : AccessibilityEvent.CONTENT_CHANGE_TYPE_PANE_DISAPPEARED);
             }
-        }
 
-        notifyAppearedOrDisappearedForContentCaptureIfNeeded(isVisible);
-        if (!getSystemGestureExclusionRects().isEmpty() && isVisible != oldVisible) {
-            postUpdateSystemGestureExclusionRects();
+            notifyAppearedOrDisappearedForContentCaptureIfNeeded(isVisible);
+
+            if (!getSystemGestureExclusionRects().isEmpty()) {
+                postUpdateSystemGestureExclusionRects();
+            }
         }
     }