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

Commit 9cc96185 authored by Ryan Lin's avatar Ryan Lin Committed by Android (Google) Code Review
Browse files

Merge "Use DisplayContext to replace default context"

parents 3c870a71 983a9969

services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java

+3 −2
Original line number Diff line number Diff line
@@ -385,9 +385,10 @@ class AccessibilityInputFilter extends InputFilter implements EventStreamTransfo 


        for (int i = displaysList.size() - 1; i >= 0; i--) {

            final int displayId = displaysList.get(i).getDisplayId();

            final Context displayContext = mContext.createDisplayContext(displaysList.get(i));



            if ((mEnabledFeatures & FLAG_FEATURE_TOUCH_EXPLORATION) != 0) {

                TouchExplorer explorer = new TouchExplorer(mContext, mAms);

                TouchExplorer explorer = new TouchExplorer(displayContext, mAms);

                addFirstEventHandler(displayId, explorer);

                mTouchExplorer.put(displayId, explorer);

            }
@@ -400,7 +401,7 @@ class AccessibilityInputFilter extends InputFilter implements EventStreamTransfo 
                final boolean triggerable = (mEnabledFeatures

                        & FLAG_FEATURE_TRIGGERED_SCREEN_MAGNIFIER) != 0;

                MagnificationGestureHandler magnificationGestureHandler =

                        new MagnificationGestureHandler(mContext,

                        new MagnificationGestureHandler(displayContext,

                                mAms.getMagnificationController(),

                                detectControlGestures, triggerable, displayId);

                addFirstEventHandler(displayId, magnificationGestureHandler);