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

Commit 135b354b authored by Jacky Kao's avatar Jacky Kao Committed by Automerger Merge Worker
Browse files

Merge changes from topic "A11y_Bound" into tm-dev am: 3de3b76c 

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

Change-Id: I9b2262e4db1f0878dffb9f19d7479b5b2ed42c8d
parents e7a85f81 3de3b76c

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

+2 −32
Original line number Diff line number Diff line
@@ -267,6 +267,8 @@ 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);
@@ -458,19 +460,6 @@ 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)) {
@@ -775,25 +764,6 @@ 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

+279 −38

File changed.

Preview size limit exceeded, changes collapsed.