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 am: 6a435bb6bb

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17802284

Change-Id: Idc9654f062fcd17db94f5f19465727070c8f316f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ryan Lin
2022-04-19 03:04:00 +00:00
committed by Automerger Merge Worker
parent 055bd999ed 6a435bb6bb
commit 9a48eb7c0b
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;
}
void setWindowMatrix(Matrix m) {
// If the window matrix is identity or doesn't change, do nothing.
if (m.isIdentity() || m.equals(mWindowMatrixForEmbeddedHierarchy)) {
void setWindowMatrix(Matrix m, boolean force) {
// If the window matrix doesn't change, do nothing.
if (!force && m.equals(mWindowMatrixForEmbeddedHierarchy)) {
return;
}

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

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