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

Merge "Correctly handle TargetAccessibilityFocus flag" into sc-dev

Browse Source
This commit is contained in:
Saho Kobayashi
2021-04-01 03:36:48 +00:00
committed by Android (Google) Code Review
parent cfb4fa83d2 6485b545e0
commit f80bd0f769
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
core/java/android/view/ViewGroup.java
View File

@@ -2053,26 +2053,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
for (int i = childrenCount - 1; i >= 0; i--) { for (int i = childrenCount - 1; i >= 0; i--) {
final int childIndex = getAndVerifyPreorderedIndex(childrenCount, i, customOrder); final int childIndex = getAndVerifyPreorderedIndex(childrenCount, i, customOrder);
final View child = getAndVerifyPreorderedView(preorderedList, children, childIndex); final View child = getAndVerifyPreorderedView(preorderedList, children, childIndex);
View childWithAccessibilityFocus =
event.isTargetAccessibilityFocus()
? findChildWithAccessibilityFocus()
: null;
if (!child.canReceivePointerEvents() if (!child.canReceivePointerEvents()
|| !isTransformedTouchPointInView(x, y, child, null)) { || !isTransformedTouchPointInView(x, y, child, null)) {
// If there is a view that has accessibility focus we want it
// to get the event first and if not handled we will perform a
// normal dispatch. We may do a double iteration but this is
// safer given the timeframe.
if (childWithAccessibilityFocus != null) {
if (childWithAccessibilityFocus != child) {
continue;
}
childWithAccessibilityFocus = null;
i = childrenCount - 1;
}
event.setTargetAccessibilityFocus(false);
continue; continue;
} }
final PointerIcon pointerIcon = final PointerIcon pointerIcon =
@@ -2730,8 +2713,22 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
childrenCount, i, customOrder); childrenCount, i, customOrder);
final View child = getAndVerifyPreorderedView( final View child = getAndVerifyPreorderedView(
preorderedList, children, childIndex); preorderedList, children, childIndex);
// If there is a view that has accessibility focus we want it
// to get the event first and if not handled we will perform a
// normal dispatch. We may do a double iteration but this is
// safer given the timeframe.
if (childWithAccessibilityFocus != null) {
if (childWithAccessibilityFocus != child) {
continue;
}
childWithAccessibilityFocus = null;
i = childrenCount - 1;
}
if (!child.canReceivePointerEvents() if (!child.canReceivePointerEvents()
|| !isTransformedTouchPointInView(x, y, child, null)) { || !isTransformedTouchPointInView(x, y, child, null)) {
ev.setTargetAccessibilityFocus(false);
continue; continue;
} }