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

Merge "Fix InlineFilteringTest#testFiltering_filtersByPrefix" into tm-dev

Browse Source
This commit is contained in:
Ryan Lin
2022-04-19 02:35:08 +00:00
committed by Android (Google) Code Review
parent a944a2c1ad 9f226ba4c4
commit 6a435bb6bb
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/view/RemoteAccessibilityController.java
View File

@@ -140,9 +140,9 @@ class RemoteAccessibilityController {
return mConnectionWrapper; return mConnectionWrapper;
} }
void setWindowMatrix(Matrix m) { void setWindowMatrix(Matrix m, boolean force) {
// If the window matrix is identity or doesn't change, do nothing. // If the window matrix doesn't change, do nothing.
if (m.isIdentity() || m.equals(mWindowMatrixForEmbeddedHierarchy)) { if (!force && m.equals(mWindowMatrixForEmbeddedHierarchy)) {
return; return;
} }

8
core/java/android/view/SurfaceView.java
View File

@@ -848,7 +848,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
} }
} }
applyTransactionOnVriDraw(surfaceUpdateTransaction); applyTransactionOnVriDraw(surfaceUpdateTransaction);
updateEmbeddedAccessibilityMatrix(); updateEmbeddedAccessibilityMatrix(false);
mSurfaceFrame.left = 0; mSurfaceFrame.left = 0;
mSurfaceFrame.top = 0; mSurfaceFrame.top = 0;
@@ -1750,7 +1750,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
mRemoteAccessibilityController.assosciateHierarchy(connection, mRemoteAccessibilityController.assosciateHierarchy(connection,
getViewRootImpl().mLeashToken, getAccessibilityViewId()); getViewRootImpl().mLeashToken, getAccessibilityViewId());
updateEmbeddedAccessibilityMatrix(); updateEmbeddedAccessibilityMatrix(true);
} }
private void notifySurfaceDestroyed() { private void notifySurfaceDestroyed() {
@@ -1778,7 +1778,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
} }
} }
void updateEmbeddedAccessibilityMatrix() { void updateEmbeddedAccessibilityMatrix(boolean force) {
if (!mRemoteAccessibilityController.connected()) { if (!mRemoteAccessibilityController.connected()) {
return; return;
} }
@@ -1792,7 +1792,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
mTmpMatrix.setTranslate(mTmpRect.left, mTmpRect.top); mTmpMatrix.setTranslate(mTmpRect.left, mTmpRect.top);
mTmpMatrix.postScale(mScreenRect.width() / (float) mSurfaceWidth, mTmpMatrix.postScale(mScreenRect.width() / (float) mSurfaceWidth,
mScreenRect.height() / (float) mSurfaceHeight); mScreenRect.height() / (float) mSurfaceHeight);
mRemoteAccessibilityController.setWindowMatrix(mTmpMatrix); mRemoteAccessibilityController.setWindowMatrix(mTmpMatrix, force);
} }
@Override @Override