From 2dca7ca9bfcb120f41d16923172796bb540103be Mon Sep 17 00:00:00 2001 From: Svet Ganov Date: Tue, 2 Jun 2015 09:45:16 -0700 Subject: [PATCH] Respect accessibility importance for before/after node ordering. One can set a view to be visited before/after another one for accessibility but the before/after target views were always added to the node info for the view regardless if they are included for accessiilbity. Now the target viwes are reported only if they should be included for accessibility. Change-Id: Iba64e6f0ee0dc090c8c3e6a0a940df8c7ecd49d9 --- 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 81f9f997c4b78..a481a1b1202ef 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -6364,7 +6364,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } View next = rootView.findViewInsideOutShouldExist(this, mAccessibilityTraversalBeforeId); - if (next != null) { + if (next != null && next.includeForAccessibility()) { info.setTraversalBefore(next); } } @@ -6376,7 +6376,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } View next = rootView.findViewInsideOutShouldExist(this, mAccessibilityTraversalAfterId); - if (next != null) { + if (next != null && next.includeForAccessibility()) { info.setTraversalAfter(next); } }