Merge "Revert "Descreses the counts of windows_change_bounds events"" into tm-dev (3a1c70f6) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/AccessibilityController.java

+32 −2

Original line number	Diff line number	Diff line
		@@ -263,8 +263,6 @@ final class AccessibilityController {
		FLAGS_MAGNIFICATION_CALLBACK \| FLAGS_WINDOWS_FOR_ACCESSIBILITY_CALLBACK,
		"displayId=" + displayId + "; spec={" + spec + "}");
		}
		mAccessibilityWindowsPopulator.setMagnificationSpec(displayId, spec);

		final DisplayMagnifier displayMagnifier = mDisplayMagnifiers.get(displayId);
		if (displayMagnifier != null) {
		displayMagnifier.setMagnificationSpec(spec);
		@@ -456,6 +454,19 @@ final class AccessibilityController {
		return null;
		}

		boolean getMagnificationSpecForDisplay(int displayId, MagnificationSpec outSpec) {
		if (mAccessibilityTracing.isTracingEnabled(FLAGS_MAGNIFICATION_CALLBACK)) {
		mAccessibilityTracing.logTrace(TAG + ".getMagnificationSpecForDisplay",
		FLAGS_MAGNIFICATION_CALLBACK, "displayId=" + displayId);
		}
		final DisplayMagnifier displayMagnifier = mDisplayMagnifiers.get(displayId);
		if (displayMagnifier == null) {
		return false;
		}

		return displayMagnifier.getMagnificationSpec(outSpec);
		}

		boolean hasCallbacks() {
		if (mAccessibilityTracing.isTracingEnabled(FLAGS_MAGNIFICATION_CALLBACK
		\| FLAGS_WINDOWS_FOR_ACCESSIBILITY_CALLBACK)) {
		@@ -757,6 +768,25 @@ final class AccessibilityController {
		return spec;
		}

		boolean getMagnificationSpec(MagnificationSpec outSpec) {
		if (mAccessibilityTracing.isTracingEnabled(FLAGS_MAGNIFICATION_CALLBACK)) {
		mAccessibilityTracing.logTrace(LOG_TAG + ".getMagnificationSpec",
		FLAGS_MAGNIFICATION_CALLBACK);
		}
		MagnificationSpec spec = mMagnifedViewport.getMagnificationSpec();
		if (spec == null) {
		return false;
		}

		outSpec.setTo(spec);
		if (mAccessibilityTracing.isTracingEnabled(FLAGS_MAGNIFICATION_CALLBACK)) {
		mAccessibilityTracing.logTrace(LOG_TAG + ".getMagnificationSpec",
		FLAGS_MAGNIFICATION_CALLBACK, "outSpec={" + outSpec + "}");
		}

		return true;
		}

		void getMagnificationRegion(Region outMagnificationRegion) {
		if (mAccessibilityTracing.isTracingEnabled(FLAGS_MAGNIFICATION_CALLBACK)) {
		mAccessibilityTracing.logTrace(LOG_TAG + ".getMagnificationRegion",

services/core/java/com/android/server/wm/AccessibilityWindowsPopulator.java

+42 −277

File changed.

Preview size limit exceeded, changes collapsed.