Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3de3b76c authored by Jacky Kao's avatar Jacky Kao Committed by Android (Google) Code Review
Browse files

Merge changes from topic "A11y_Bound" into tm-dev

* changes:
  Fixs the ANR issue
  Descreses the counts of windows_change_bounds events
parents 81eff37a ce4c0225
Loading
Loading
Loading
Loading
+2 −32
Original line number Original line Diff line number Diff line
@@ -267,6 +267,8 @@ final class AccessibilityController {
                    FLAGS_MAGNIFICATION_CALLBACK | FLAGS_WINDOWS_FOR_ACCESSIBILITY_CALLBACK,
                    FLAGS_MAGNIFICATION_CALLBACK | FLAGS_WINDOWS_FOR_ACCESSIBILITY_CALLBACK,
                    "displayId=" + displayId + "; spec={" + spec + "}");
                    "displayId=" + displayId + "; spec={" + spec + "}");
        }
        }
        mAccessibilityWindowsPopulator.setMagnificationSpec(displayId, spec);

        final DisplayMagnifier displayMagnifier = mDisplayMagnifiers.get(displayId);
        final DisplayMagnifier displayMagnifier = mDisplayMagnifiers.get(displayId);
        if (displayMagnifier != null) {
        if (displayMagnifier != null) {
            displayMagnifier.setMagnificationSpec(spec);
            displayMagnifier.setMagnificationSpec(spec);
@@ -458,19 +460,6 @@ final class AccessibilityController {
        return null;
        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() {
    boolean hasCallbacks() {
        if (mAccessibilityTracing.isTracingEnabled(FLAGS_MAGNIFICATION_CALLBACK
        if (mAccessibilityTracing.isTracingEnabled(FLAGS_MAGNIFICATION_CALLBACK
                | FLAGS_WINDOWS_FOR_ACCESSIBILITY_CALLBACK)) {
                | FLAGS_WINDOWS_FOR_ACCESSIBILITY_CALLBACK)) {
@@ -775,25 +764,6 @@ final class AccessibilityController {
            return spec;
            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) {
        void getMagnificationRegion(Region outMagnificationRegion) {
            if (mAccessibilityTracing.isTracingEnabled(FLAGS_MAGNIFICATION_CALLBACK)) {
            if (mAccessibilityTracing.isTracingEnabled(FLAGS_MAGNIFICATION_CALLBACK)) {
                mAccessibilityTracing.logTrace(LOG_TAG + ".getMagnificationRegion",
                mAccessibilityTracing.logTrace(LOG_TAG + ".getMagnificationRegion",
+279 −38

File changed.

Preview size limit exceeded, changes collapsed.