summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Qasid Sadiq <qasid@google.com> 2018-07-02 12:46:14 -0700
committer Qasid Sadiq <qasid@google.com> 2018-07-02 12:46:14 -0700
commitc7f8833c4ad20c21549cf9afc8a59cd4e8265742 (patch)
treecb9282b1920c11f098db96b34db014c3264fac43
parent24158ba81be3a87493b3d6fd6b8df29078e2df32 (diff)
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
-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 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