Merge "Fix InlineFilteringTest#testFiltering_filtersByPrefix" into tm-dev (6a435bb6) · Commits · e / os / android_frameworks_base

core/java/android/view/RemoteAccessibilityController.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -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;
		}

+4 −4

Original line number	Diff line number	Diff line
		@@ -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