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

Mark accessibility focus bounds as keep clear area

Browse Source 
Similar to how input focus can create an automatic keep clear area,
this change makes the current accessibility focus rect a keep clear
area.

Bug: 220108592
Test: atest KeepClearRectsTests
Change-Id: I26ca9bf81db31a34046f2453310c1a2f2d8823e8
This commit is contained in:
Robert Horvath
2022-02-23 18:09:46 +01:00
parent 5ccead1084
commit c48d9032ba
1 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/java/android/view/ViewRootImpl.java
View File

@@ -802,6 +802,7 @@ public final class ViewRootImpl implements ViewParent,
private final ViewRootRectTracker mUnrestrictedKeepClearRectsTracker =
new ViewRootRectTracker(v -> v.collectUnrestrictedPreferKeepClearRects());
private boolean mHasPendingKeepClearAreaChange;
private Rect mKeepClearAccessibilityFocusRect;
private IAccessibilityEmbeddedConnection mAccessibilityEmbeddedConnection;
@@ -4824,13 +4825,27 @@ public final class ViewRootImpl implements ViewParent,
mHandler.sendEmptyMessage(MSG_KEEP_CLEAR_RECTS_CHANGED);
}
void keepClearRectsChanged() {
private void updateKeepClearForAccessibilityFocusRect() {
if (mViewConfiguration.isPreferKeepClearForFocusEnabled()) {
if (mKeepClearAccessibilityFocusRect == null) {
mKeepClearAccessibilityFocusRect = new Rect();
}
boolean hasAccessibilityFocus =
getAccessibilityFocusedRect(mKeepClearAccessibilityFocusRect);
if (!hasAccessibilityFocus) {
mKeepClearAccessibilityFocusRect.setEmpty();
}
mHandler.obtainMessage(MSG_KEEP_CLEAR_RECTS_CHANGED, 1, 0).sendToTarget();
}
}
void keepClearRectsChanged(boolean accessibilityFocusRectChanged) {
boolean restrictedKeepClearRectsChanged = mKeepClearRectsTracker.computeChanges();
boolean unrestrictedKeepClearRectsChanged =
mUnrestrictedKeepClearRectsTracker.computeChanges();
if ((restrictedKeepClearRectsChanged || unrestrictedKeepClearRectsChanged)
&& mView != null) {
if ((restrictedKeepClearRectsChanged || unrestrictedKeepClearRectsChanged
|| accessibilityFocusRectChanged) && mView != null) {
mHasPendingKeepClearAreaChange = true;
// Only report keep clear areas immediately if they have not been reported recently
if (!mHandler.hasMessages(MSG_REPORT_KEEP_CLEAR_RECTS)) {
@@ -4847,10 +4862,16 @@ public final class ViewRootImpl implements ViewParent,
}
mHasPendingKeepClearAreaChange = false;
final List<Rect> restrictedKeepClearRects = mKeepClearRectsTracker.getLastComputedRects();
List<Rect> restrictedKeepClearRects = mKeepClearRectsTracker.getLastComputedRects();
final List<Rect> unrestrictedKeepClearRects =
mUnrestrictedKeepClearRectsTracker.getLastComputedRects();
if (mKeepClearAccessibilityFocusRect != null
&& !mKeepClearAccessibilityFocusRect.isEmpty()) {
restrictedKeepClearRects = new ArrayList<>(restrictedKeepClearRects);
restrictedKeepClearRects.add(mKeepClearAccessibilityFocusRect);
}
try {
mWindowSession.reportKeepClearAreasChanged(mWindow, restrictedKeepClearRects,
unrestrictedKeepClearRects);
@@ -5050,6 +5071,7 @@ public final class ViewRootImpl implements ViewParent,
// Set the new focus host and node.
mAccessibilityFocusedHost = view;
mAccessibilityFocusedVirtualView = node;
updateKeepClearForAccessibilityFocusRect();
if (mAttachInfo.mThreadedRenderer != null) {
mAttachInfo.mThreadedRenderer.invalidateRoot();
@@ -5638,7 +5660,7 @@ public final class ViewRootImpl implements ViewParent,
systemGestureExclusionChanged();
} break;
case MSG_KEEP_CLEAR_RECTS_CHANGED: {
keepClearRectsChanged();
keepClearRectsChanged(/* accessibilityFocusRectChanged= */ msg.arg1 == 1);
} break;
case MSG_REPORT_KEEP_CLEAR_RECTS: {
reportKeepClearAreasChanged();