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

Commit a4d92da8 authored by Jackal Guo's avatar Jackal Guo Committed by Android (Google) Code Review
Browse files

Merge "Refine adjustIsVisibleToUser"

parents ff200957 ecd09bb6

core/java/android/view/AccessibilityInteractionController.java

+10 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.view;



import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD;

import static android.view.accessibility.AccessibilityNodeInfo.ACTION_ARGUMENT_ACCESSIBLE_CLICKABLE_SPAN;

import static android.view.accessibility.AccessibilityNodeInfo.EXTRA_DATA_REQUESTED_KEY;

import static android.view.accessibility.AccessibilityNodeInfo.EXTRA_DATA_TEXT_CHARACTER_LOCATION_KEY;
@@ -797,11 +798,19 @@ public final class AccessibilityInteractionController { 
        }

        Rect boundsInScreen = mTempRect;

        info.getBoundsInScreen(boundsInScreen);

        if (interactiveRegion.quickReject(boundsInScreen)) {

        if (interactiveRegion.quickReject(boundsInScreen) && !shouldBypassAdjustIsVisible()) {

            info.setVisibleToUser(false);

        }

    }



    private boolean shouldBypassAdjustIsVisible() {

        final int windowType = mViewRootImpl.mOrigWindowType;

        if (windowType == TYPE_INPUT_METHOD) {

            return true;

        }

        return false;

    }



    private void applyAppScaleAndMagnificationSpecIfNeeded(AccessibilityNodeInfo info,

            MagnificationSpec spec) {

        if (info == null) {