Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "AccessibilityEvents for visibility changes should be subtree events.""

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-13 06:20:37 +00:00
committed by Android (Google) Code Review
parent 2758853c7d d9f2151ae7
commit 1e96ff75bd
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/java/android/view/View.java
View File

@@ -15585,7 +15585,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
*/
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
void setFlags(int flags, int mask) {
final boolean accessibilityEnabled = AccessibilityManager.getInstance(mContext).isEnabled();
final boolean accessibilityEnabled =
AccessibilityManager.getInstance(mContext).isEnabled();
final boolean oldIncludeForAccessibility = accessibilityEnabled && includeForAccessibility();
int old = mViewFlags;
@@ -15800,14 +15801,19 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
if (accessibilityEnabled) {
// If we're an accessibility pane and the visibility changed, we already have sent
// a state change, so we really don't need to report other changes.
// Accessibility Services aren't concerned with changes between GONE and INVISIBLE.
boolean visibilityChanged = !isAccessibilityPane() && ((changed & VISIBILITY_MASK) != 0)
&& ((old & VISIBILITY_MASK) == VISIBLE || newVisibility == VISIBLE);
if (oldIncludeForAccessibility != includeForAccessibility() || visibilityChanged) {
notifySubtreeAccessibilityStateChangedIfNeeded();
} else if ((changed & ENABLED_MASK) != 0 || (changed & FOCUSABLE) != 0
if (isAccessibilityPane()) {
changed &= ~VISIBILITY_MASK;
}
if ((changed & FOCUSABLE) != 0 || (changed & VISIBILITY_MASK) != 0
|| (changed & CLICKABLE) != 0 || (changed & LONG_CLICKABLE) != 0
|| (changed & CONTEXT_CLICKABLE) != 0) {
if (oldIncludeForAccessibility != includeForAccessibility()) {
notifySubtreeAccessibilityStateChangedIfNeeded();
} else {
notifyViewAccessibilityStateChangedIfNeeded(
AccessibilityEvent.CONTENT_CHANGE_TYPE_UNDEFINED);
}
} else if ((changed & ENABLED_MASK) != 0) {
notifyViewAccessibilityStateChangedIfNeeded(
AccessibilityEvent.CONTENT_CHANGE_TYPE_UNDEFINED);
}