From c7f8833c4ad20c21549cf9afc8a59cd4e8265742 Mon Sep 17 00:00:00 2001
From: Qasid Sadiq <qasid@google.com>
Date: Mon, 2 Jul 2018 12:46:14 -0700
Subject: Make sure checking for accessibility pane is consistent

The documentation states " Setting to null indicates that this View is
not a pane." So make this behave consistently in that way..

Test: it builds!
Change-Id: Ied03a313b1fa1e26393f1497d63658acf6e297f4
---
 core/java/android/view/View.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 546ea87e23a2..8e0497f5ada5 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -7547,7 +7547,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
      */
     public void onPopulateAccessibilityEventInternal(AccessibilityEvent event) {
         if ((event.getEventType() == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED)
-                && !TextUtils.isEmpty(getAccessibilityPaneTitle())) {
+                && isAccessibilityPane()) {
             event.getText().add(getAccessibilityPaneTitle());
         }
     }
@@ -12963,7 +12963,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
                 }
             }
         }
-        if (!TextUtils.isEmpty(getAccessibilityPaneTitle())) {
+        if (isAccessibilityPane()) {
             if (isVisible != oldVisible) {
                 notifyViewAccessibilityStateChangedIfNeeded(isVisible
                         ? AccessibilityEvent.CONTENT_CHANGE_TYPE_PANE_APPEARED
-- 
cgit v1.2.3-59-g8ed1b